diff --git a/.github/workflows/increment-plugin-versions.yml b/.github/workflows/increment-plugin-versions.yml
new file mode 100644
index 0000000000..fba478d0d5
--- /dev/null
+++ b/.github/workflows/increment-plugin-versions.yml
@@ -0,0 +1,89 @@
+---
+name: Increment Plugin Versions
+
+on:
+  workflow_dispatch:
+    inputs:
+      logLevel:
+        description: Log level
+        required: true
+        default: warning
+        type: choice
+        options:
+          - info
+          - warning
+          - debug
+
+jobs:
+  plugin-version-increment-sync:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        entry:
+          - {repo: alerting}
+          - {repo: anomaly-detection}
+          - {repo: asynchronous-search}
+          - {repo: common-utils}
+          - {repo: cross-cluster-replication}
+          - {repo: dashboards-reports, path: reports-scheduler}
+          - {repo: geospatial}
+          - {repo: index-management}
+          - {repo: job-scheduler}
+          - {repo: k-NN}
+          - {repo: ml-commons}
+          - {repo: notifications, path: notifications}
+          - {repo: observability, path: opensearch-observability}
+          - {repo: performance-analyzer}
+          - {repo: performance-analyzer-rca}
+          - {repo: security}
+          - {repo: sql}
+        branch:
+          - 'main'
+          - '2.x'
+          - '2.1'
+          - '2.2'
+    steps:
+      - name: Check out OpenSearch repo
+        uses: actions/checkout@v3
+        with:
+          repository: opensearch-project/OpenSearch
+          ref: ${{ matrix.branch }}
+      - name: Fetch OpenSearch version
+        run: |
+          OPENSEARCH_VERSION=$(cat buildSrc/version.properties | grep opensearch | cut -d= -f2 | grep -oE '[0-9.]+')
+          echo "OPENSEARCH_VERSION_NUMBER=$OPENSEARCH_VERSION" >> $GITHUB_ENV
+          OPENSEARCH_VERSION=$OPENSEARCH_VERSION-SNAPSHOT
+          echo "OPENSEARCH_VERSION=$OPENSEARCH_VERSION" >> $GITHUB_ENV
+      - name: Check out plugin repo
+        uses: actions/checkout@v3
+        with:
+          repository: opensearch-project/${{ matrix.entry.repo }}
+          ref: ${{ matrix.branch }}
+      - name: Increment Version in ${{ matrix.entry.repo }}
+        run: |
+          echo "OpenSearch Core repo version on branch ${{ matrix.branch }} is ${{ env.OPENSEARCH_VERSION_NUMBER }}"
+          if [ ${{ matrix.entry.path }} ]; then
+            echo "The gradle path is ${{ matrix.entry.path }}"
+            cd ${{ matrix.entry.path }}
+          fi
+          ./gradlew updateVersion -DnewVersion=${{ env.OPENSEARCH_VERSION }}
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v4
+        with:
+          token: ${{ secrets.CIBOTAUTOPR }}
+          author: opensearch-ci-bot <opensearch-infra@amazon.com>
+          commit-message: |
+            Increment version to ${{ env.OPENSEARCH_VERSION }}
+
+            Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
+          delete-branch: true
+          branch: create-pull-request/${{ env.OPENSEARCH_VERSION }}
+          title: '[AUTO] Increment version to ${{ env.OPENSEARCH_VERSION }}'
+          body: |
+            - Incremented version to **${{ env.OPENSEARCH_VERSION }}**.
+      - name: Check outputs
+        run: |-
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
diff --git a/.github/workflows/versionincrement.yaml b/.github/workflows/versionincrement.yaml
deleted file mode 100644
index 44d5ece2e1..0000000000
--- a/.github/workflows/versionincrement.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
----
-name: Version Increment
-on:
-  workflow_dispatch:
-    inputs:
-      logLevel:
-        description: Log level
-        required: true
-        default: warning
-        type: choice
-        options:
-          - info
-          - warning
-          - debug
-
-jobs:
-  plugin-version-increment-sync:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        repo: [common-utils, job-scheduler, ml-commons, performance-analyzer, performance-analyzer-rca, security, alerting, index-management, sql, observability, asynchronous-search, k-NN, anomaly-detection, cross-cluster-replication, dashboards-reports, geospatial]
-        branch: [{opensearch_branch: 2.x, plugin_branch: 2.x}, {opensearch_branch: 2.1, plugin_branch: 2.1}, {opensearch_branch: 2.2, plugin_branch: 2.2}, {opensearch_branch: main, plugin_branch: main}]
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - name: Check out OpenSearch repo
-        uses: actions/checkout@v3
-        with:
-          repository: opensearch-project/OpenSearch
-          ref: ${{ matrix.branch.opensearch_branch }}
-      - name: Fetch OpenSearch version
-        run: |
-          OPENSEARCH_VERSION=$(cat buildSrc/version.properties | grep opensearch | cut -d= -f2 | grep -oE '[0-9.]+')
-          OPENSEARCH_VERSION=$OPENSEARCH_VERSION-SNAPSHOT
-          echo "OPENSEARCH_VERSION=$OPENSEARCH_VERSION" >> $GITHUB_ENV
-          echo "OPENSEARCH_VERSION_NUMBER=$OPENSEARCH_VERSION" | cut -f1 -d"-" >> $GITHUB_ENV
-      - name: Check out plugin repo
-        uses: actions/checkout@v3
-        with:
-          repository: opensearch-project/${{ matrix.repo }}
-          ref: ${{ matrix.branch.plugin_branch }}
-      - name: Version Increment plugin repo
-      # If condition for plugins with Gradle Project in subfolders.
-        run: |
-          echo "OpenSearch Core repo version on branch ${{ matrix.branch.opensearch_branch }} is ${{ env.OPENSEARCH_VERSION_NUMBER }}"
-          if [ ${{ matrix.repo }} == "dashboards-reports" ]; then
-            cd reports-scheduler
-            ./gradlew versionIncrement -DnewVersion=${{ env.OPENSEARCH_VERSION }}
-          elif [ ${{ matrix.repo }} == "observability" ]; then
-            cd opensearch-observability
-            ./gradlew versionIncrement -DnewVersion=${{ env.OPENSEARCH_VERSION }}
-          elif [ ${{ matrix.repo }} == "notifications" ]; then
-            cd notifications
-            ./gradlew versionIncrement -DnewVersion=${{ env.OPENSEARCH_VERSION }}
-          else
-            ./gradlew versionIncrement -DnewVersion=${{ env.OPENSEARCH_VERSION }}
-          fi
-      - name: Create Pull Request
-        id: cpr
-        uses: peter-evans/create-pull-request@v4
-        with:
-          token: ${{ secrets.CIBOTAUTOPR }}
-          author: opensearch-ci-bot <opensearch-infra@amazon.com>
-          commit-message: |
-            Version Increment.
-
-            Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
-          delete-branch: true
-          branch: create-pull-request/${{ env.OPENSEARCH_VERSION }}
-          title: '[AUTO] Version Increment to ${{ env.OPENSEARCH_VERSION }}'
-          body: |
-            - Version Increment for **${{ matrix.repo }}** plugin to **${{ env.OPENSEARCH_VERSION }}**.
-      - name: Check outputs
-        run: |-
-          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
-          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
diff --git a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile
index cc189e65ca..bd2b0210f0 100644
--- a/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile
+++ b/jenkins/opensearch-maven-release/maven-sign-release.jenkinsfile
@@ -22,6 +22,7 @@ pipeline {
     }
     environment {
         ARTIFACT_PATH = "distribution-build-opensearch/${VERSION}/${BUILD_ID}/linux/x64/tar/builds"
+        ARTIFACT_BUCKET_NAME = credentials('jenkins-artifact-bucket-name')
     }
     stages {
         stage('sign') {
diff --git a/jenkins/opensearch-ruby/Jenkinsfile b/jenkins/opensearch-ruby/Jenkinsfile
index b927bc4831..b9cb5dc94a 100644
--- a/jenkins/opensearch-ruby/Jenkinsfile
+++ b/jenkins/opensearch-ruby/Jenkinsfile
@@ -12,6 +12,9 @@ pipeline {
             trim: true
         )
     }
+    environment {
+        ARTIFACT_BUCKET_NAME = credentials('jenkins-artifact-bucket-name')
+    }
     stages {
         stage('ruby-build-sign-upload') {
             agent {
@@ -28,7 +31,7 @@ pipeline {
                         error('RELEASE_BRANCH parameter is not set')
                     }
                     git url: 'https://github.com/opensearch-project/opensearch-ruby.git', branch: "$RELEASE_BRANCH"
-                    withCredentials([string(credentialsId: 'opensearchproject-rubygems-private-key', variable: 'RUBYGEMS_PRIVATE_KEY')]) {
+                    withCredentials([string(credentialsId: 'jenkins-opensearchproject-rubygems-private-key', variable: 'RUBYGEMS_PRIVATE_KEY')]) {
                         writeFile file: 'gem-private_key.pem', text: RUBYGEMS_PRIVATE_KEY
                     }
                     sh'''
diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
index 7d98f55c3f..467ee395b3 100644
--- a/jenkins/opensearch/distribution-build.jenkinsfile
+++ b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -67,18 +67,18 @@ pipeline {
         }
         stage('build') {
             parallel {
-                stage('build-snapshot-x64-tar') {
+                /*stage('build-snapshot-x64-darwin-tar') {
                     environment {
                         SNAPSHOT_REPO_URL = "https://aws.oss.sonatype.org/content/repositories/snapshots/"
                     }
                     agent {
-                        docker {
-                            label AGENT_X64
-                            image dockerAgent.image
-                            args dockerAgent.args
-                            alwaysPull true
+                        node {
+                            label 'Jenkins-Agent-Mac-M1-Single-Host'
                         }
                     }
+                    tools {
+                        jdk 'jdk-17'
+                    }
                     steps {
                         script {
                             buildManifest(
@@ -109,8 +109,8 @@ pipeline {
                             postCleanup()
                         }
                     }
-                }
-                stage('build-snapshot-arm64-tar') {
+                }*/
+                /*stage('build-snapshot-arm64-tar') {
                     agent {
                         docker {
                             label AGENT_ARM64
@@ -139,16 +139,16 @@ pipeline {
                             postCleanup()
                         }
                     }
-                }
+                } */
                 stage('build-and-test-x64-tar') {
                     agent {
-                        docker {
-                            label AGENT_X64
-                            image dockerAgent.image
-                            args dockerAgent.args
-                            alwaysPull true
+                        node {
+                            label 'Jenkins-Agent-Mac-M1-Single-Host'
                         }
                     }
+                    tools {
+                        jdk 'jdk-17'
+                    }
                     steps {
                         script {
                             def buildManifestObj = buildAssembleUpload(
@@ -225,7 +225,7 @@ pipeline {
                         }
                     }
                 }
-                stage('build-and-test-x64-rpm') {
+                /*stage('build-and-test-x64-rpm') {
                     agent { label AGENT_X64 }
                     stages {
                         stage('build-archive-linux-x64-rpm') {
@@ -314,8 +314,8 @@ pipeline {
                             }
                         }
                     }
-                }
-                stage('build-and-test-arm64-tar') {
+                }*/
+                /*stage('build-and-test-arm64-tar') {
                     agent {
                         docker {
                             label AGENT_ARM64
@@ -398,8 +398,8 @@ pipeline {
                             }
                         }
                     }
-                }
-                stage('build-and-test-arm64-rpm') {
+                }*/
+                /*stage('build-and-test-arm64-rpm') {
                     agent { label AGENT_X64 }
                     stages {
                         stage('build-archive-linux-arm64-rpm') {
@@ -488,10 +488,10 @@ pipeline {
                             }
                         }
                     }
-                }
+                }*/
             }
         }
-        stage('update index file') {
+        /*stage('update index file') {
             agent {
                 docker {
                     label AGENT_X64
@@ -507,8 +507,8 @@ pipeline {
                     )
                 }
             }
-        }
-        stage('docker build') {
+        }*/
+        /*stage('docker build') {
             when {
                 beforeAgent true
                 expression { 
@@ -537,7 +537,7 @@ pipeline {
                     )
                 }
             }
-        }
+        }*/
     }
     post {
         success {
diff --git a/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile b/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile
index d1f4a0d56c..684d944b40 100644
--- a/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile
+++ b/jenkins/sign-artifacts/sign-standalone-artifacts.jenkinsfile
@@ -30,6 +30,9 @@ pipeline {
                 description: 'What is signature file type? Required only for linux signing.'
         )
     }
+    environment {
+        ARTIFACT_BUCKET_NAME = credentials('jenkins-artifact-bucket-name')
+    }
     stages {
         stage('sign') {
             steps {
diff --git a/manifests/1.3.4/opensearch-1.3.4-test.yml b/manifests/1.3.4/opensearch-1.3.4-test.yml
new file mode 100644
index 0000000000..f50fd7fc1f
--- /dev/null
+++ b/manifests/1.3.4/opensearch-1.3.4-test.yml
@@ -0,0 +1,71 @@
+---
+schema-version: '1.0'
+name: OpenSearch
+ci:
+  image:
+    name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2
+    args: -e JAVA_HOME=/opt/java/openjdk-11
+components:
+  - name: index-management
+    integ-test:
+      build-dependencies:
+        - job-scheduler
+      test-configs:
+        - with-security
+        - without-security
+      additional-cluster-configs:
+        path.repo: [/tmp]
+
+  - name: anomaly-detection
+    integ-test:
+      build-dependencies:
+        - job-scheduler
+      test-configs:
+        - with-security
+        - without-security
+
+  - name: asynchronous-search
+    integ-test:
+      test-configs:
+        - with-security
+        - without-security
+
+  - name: alerting
+    integ-test:
+      test-configs:
+        - with-security
+        - without-security
+      additional-cluster-configs:
+        plugins.destination.host.deny_list: [10.0.0.0/8, 127.0.0.1]
+
+  - name: sql
+    integ-test:
+      test-configs:
+        - with-security
+        - without-security
+      additional-cluster-configs:
+        script.context.field.max_compilations_rate: 1000/1m
+
+  - name: k-NN
+    integ-test:
+      test-configs:
+        - with-security
+        - without-security
+
+  - name: dashboards-reports
+    working-directory: reports-scheduler
+    integ-test:
+      test-configs:
+        - without-security
+
+  - name: observability
+    working-directory: opensearch-observability
+    integ-test:
+      test-configs:
+        - without-security
+
+  - name: ml-commons
+    integ-test:
+      test-configs:
+        - with-security
+        - without-security
diff --git a/manifests/1.3.4/opensearch-1.3.4.yml b/manifests/1.3.4/opensearch-1.3.4.yml
index e978ba2759..442a1393b5 100644
--- a/manifests/1.3.4/opensearch-1.3.4.yml
+++ b/manifests/1.3.4/opensearch-1.3.4.yml
@@ -10,34 +10,99 @@ ci:
 components:
   - name: OpenSearch
     repository: https://github.com/opensearch-project/OpenSearch.git
-    ref: '1.3'
+    ref: tags/1.3.4
     checks:
       - gradle:publish
       - gradle:properties:version
   - name: common-utils
     repository: https://github.com/opensearch-project/common-utils.git
-    ref: '1.3'
+    ref: tags/1.3.4.0
     checks:
       - gradle:publish
       - gradle:properties:version
   - name: job-scheduler
     repository: https://github.com/opensearch-project/job-scheduler.git
-    ref: '1.3'
+    ref: tags/1.3.4.0
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
+  - name: ml-commons
+    repository: https://github.com/opensearch-project/ml-commons.git
+    ref: tags/1.3.4.0
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version: opensearch-ml-plugin
   - name: security
     repository: https://github.com/opensearch-project/security.git
-    ref: '1.3'
+    ref: tags/1.3.4.0
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
   - name: k-NN
     repository: https://github.com/opensearch-project/k-NN.git
-    ref: '1.3'
+    ref: tags/1.3.4.0
     platforms:
       - darwin
       - linux
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
+  - name: asynchronous-search
+    repository: https://github.com/opensearch-project/asynchronous-search.git
+    ref: tags/1.3.4.0
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+  - name: performance-analyzer
+    repository: https://github.com/opensearch-project/performance-analyzer.git
+    ref: tags/1.3.4.0
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+    platforms:
+      - darwin
+      - linux
+  - name: alerting
+    repository: https://github.com/opensearch-project/alerting.git
+    ref: tags/1.3.4.0
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version: alerting
+  - name: anomaly-detection
+    repository: https://github.com/opensearch-project/anomaly-detection.git
+    ref: tags/1.3.4.0
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+  - name: index-management
+    repository: https://github.com/opensearch-project/index-management.git
+    ref: tags/1.3.4.0
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+  - name: cross-cluster-replication
+    repository: https://github.com/opensearch-project/cross-cluster-replication.git
+    ref: tags/1.3.4.0
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+  - name: dashboards-reports
+    repository: https://github.com/opensearch-project/dashboards-reports.git
+    ref: tags/1.3.4.0
+    working_directory: reports-scheduler
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+  - name: opensearch-observability
+    repository: https://github.com/opensearch-project/observability
+    ref: tags/1.3.4.0
+    working_directory: opensearch-observability
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
+  - name: sql
+    repository: https://github.com/opensearch-project/sql.git
+    ref: tags/1.3.4.0
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version: plugin
diff --git a/manifests/1.3.4/opensearch-dashboards-1.3.4-test.yml b/manifests/1.3.4/opensearch-dashboards-1.3.4-test.yml
new file mode 100644
index 0000000000..3ad90cc802
--- /dev/null
+++ b/manifests/1.3.4/opensearch-dashboards-1.3.4-test.yml
@@ -0,0 +1,17 @@
+---
+schema-version: '1.0'
+name: OpenSearch Dashboards
+ci:
+  image:
+    name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2
+components:
+  - name: OpenSearch-Dashboards
+    bwc-test:
+      test-configs:
+        - with-security
+        - without-security
+  - name: functionalTestDashboards
+    integ-test:
+      test-configs:
+        - with-security
+        - without-security
diff --git a/manifests/1.3.4/opensearch-dashboards-1.3.4.yml b/manifests/1.3.4/opensearch-dashboards-1.3.4.yml
index 58d1f700aa..fd5c44f75a 100644
--- a/manifests/1.3.4/opensearch-dashboards-1.3.4.yml
+++ b/manifests/1.3.4/opensearch-dashboards-1.3.4.yml
@@ -9,4 +9,35 @@ ci:
 components:
   - name: OpenSearch-Dashboards
     repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
-    ref: '1.3'
+    ref: tags/1.3.4
+  - name: functionalTestDashboards
+    repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
+    ref: tags/1.3.4
+  - name: securityDashboards
+    repository: https://github.com/opensearch-project/security-dashboards-plugin.git
+    ref: tags/1.3.4.0
+  - name: anomalyDetectionDashboards
+    repository: https://github.com/opensearch-project/anomaly-detection-dashboards-plugin
+    ref: tags/1.3.4.0
+  - name: indexManagementDashboards
+    repository: https://github.com/opensearch-project/index-management-dashboards-plugin
+    ref: tags/1.3.4.0
+  - name: queryWorkbenchDashboards
+    repository: https://github.com/opensearch-project/sql.git
+    working_directory: workbench
+    ref: tags/1.3.4.0
+  - name: reportsDashboards
+    repository: https://github.com/opensearch-project/dashboards-reports.git
+    working_directory: dashboards-reports
+    ref: tags/1.3.4.0
+  - name: ganttChartDashboards
+    repository: https://github.com/opensearch-project/dashboards-visualizations.git
+    working_directory: gantt-chart
+    ref: tags/1.3.4.0
+  - name: observabilityDashboards
+    repository: https://github.com/opensearch-project/observability.git
+    working_directory: dashboards-observability
+    ref: tags/1.3.4.0
+  - name: alertingDashboards
+    repository: https://github.com/opensearch-project/alerting-dashboards-plugin.git
+    ref: tags/1.3.4.0
diff --git a/manifests/2.1.1/opensearch-2.1.1.yml b/manifests/2.1.1/opensearch-2.1.1.yml
new file mode 100644
index 0000000000..81b5d8eaa9
--- /dev/null
+++ b/manifests/2.1.1/opensearch-2.1.1.yml
@@ -0,0 +1,28 @@
+---
+schema-version: '1.0'
+build:
+  name: OpenSearch
+  version: 2.1.1
+ci:
+  image:
+    name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2
+    args: -e JAVA_HOME=/opt/java/openjdk-17
+components:
+  - name: OpenSearch
+    repository: https://github.com/opensearch-project/OpenSearch.git
+    ref: '2.1'
+    checks:
+      - gradle:publish
+      - gradle:properties:version
+  - name: common-utils
+    repository: https://github.com/opensearch-project/common-utils.git
+    ref: '2.1'
+    checks:
+      - gradle:publish
+      - gradle:properties:version
+  - name: job-scheduler
+    repository: https://github.com/opensearch-project/job-scheduler.git
+    ref: '2.1'
+    checks:
+      - gradle:properties:version
+      - gradle:dependencies:opensearch.version
diff --git a/release-notes/opensearch-release-notes-1.3.4.md b/release-notes/opensearch-release-notes-1.3.4.md
new file mode 100644
index 0000000000..32188369c7
--- /dev/null
+++ b/release-notes/opensearch-release-notes-1.3.4.md
@@ -0,0 +1,14 @@
+# OpenSearch and OpenSearch Dashboards 1.3.4 Release Notes
+
+## Release Details
+
+OpenSearch and OpenSearch Dashboards 1.3.4 includes the following bug fixes, and maintenance updates.
+
+OpenSearch [Release Notes](https://github.com/opensearch-project/OpenSearch/blob/main/release-notes/opensearch.release-notes-1.3.4.md).
+
+
+## BUG FIXES
+
+### OpenSearch Dashboards Reports
+* [1.3] Move HTML sanitization from client to server side (#382) ([#386](https://github.com/opensearch-project/dashboards-reports/pull/386))
+
diff --git a/scripts/default/opensearch/build.sh b/scripts/default/opensearch/build.sh
index 5cf8540650..3fbe1755b9 100755
--- a/scripts/default/opensearch/build.sh
+++ b/scripts/default/opensearch/build.sh
@@ -77,3 +77,8 @@ distributions="$(dirname "${zipPath}")"
 echo "COPY ${distributions}/*.zip"
 mkdir -p $OUTPUT/plugins
 cp ${distributions}/*.zip ./$OUTPUT/plugins
+
+# Publish plugin zips to maven
+./gradlew publishPluginZipPublicationToZipStagingRepository -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER
+mkdir -p $OUTPUT/maven/org/opensearch
+cp -r ./build/local-staging-repo/org/opensearch/. $OUTPUT/maven/org/opensearch
diff --git a/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-all-artifacts.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-all-artifacts.jenkinsfile.txt
index dfa4aa6201..2352ba7f8a 100644
--- a/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-all-artifacts.jenkinsfile.txt
+++ b/tests/jenkins/jenkinsjob-regression-files/data-prepper/release-data-prepper-all-artifacts.jenkinsfile.txt
@@ -22,6 +22,7 @@
                   signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                   signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                   signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
+<<<<<<< HEAD
                   signArtifacts.string({credentialsId=jenkins-signer-client-role, variable=SIGNER_CLIENT_ROLE})
                   signArtifacts.string({credentialsId=jenkins-signer-client-external-id, variable=SIGNER_CLIENT_EXTERNAL_ID})
                   signArtifacts.string({credentialsId=jenkins-signer-client-unsigned-bucket, variable=SIGNER_CLIENT_UNSIGNED_BUCKET})
@@ -35,6 +36,21 @@
                    export UNSIGNED_BUCKET=SIGNER_CLIENT_UNSIGNED_BUCKET
                    export SIGNED_BUCKET=SIGNER_CLIENT_SIGNED_BUCKET
 
+=======
+                  signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                  signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
+                     signArtifacts.readJSON({text=configs})
+                     signArtifacts.sh(
+                   #!/bin/bash
+                   set +x
+                   export ROLE=dummy_role
+                   export EXTERNAL_ID=dummy_ID
+                   export UNSIGNED_BUCKET=dummy_unsigned_bucket
+                   export SIGNED_BUCKET=dummy_signed_bucket
+                   export PROFILE_IDENTIFIER=null
+                   export PLATFORM_IDENTIFIER=null
+       
+>>>>>>> 700c80d (Add signer to support signing windows artifacts (#2156))
                    /tmp/workspace/sign.sh /tmp/workspace/archive --sigtype=.sig --platform=linux
                )
          release-data-prepper-all-artifacts.stage(Release Archives to Production Distribution Bucket, groovy.lang.Closure)
@@ -98,6 +114,7 @@
                   signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                   signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                   signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
+<<<<<<< HEAD
                   signArtifacts.string({credentialsId=jenkins-signer-client-role, variable=SIGNER_CLIENT_ROLE})
                   signArtifacts.string({credentialsId=jenkins-signer-client-external-id, variable=SIGNER_CLIENT_EXTERNAL_ID})
                   signArtifacts.string({credentialsId=jenkins-signer-client-unsigned-bucket, variable=SIGNER_CLIENT_UNSIGNED_BUCKET})
@@ -111,6 +128,21 @@
                    export UNSIGNED_BUCKET=SIGNER_CLIENT_UNSIGNED_BUCKET
                    export SIGNED_BUCKET=SIGNER_CLIENT_SIGNED_BUCKET
 
+=======
+                  signArtifacts.string({credentialsId=signer-pgp-config, variable=configs})
+                  signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], configs], groovy.lang.Closure)
+                     signArtifacts.readJSON({text=configs})
+                     signArtifacts.sh(
+                   #!/bin/bash
+                   set +x
+                   export ROLE=dummy_role
+                   export EXTERNAL_ID=dummy_ID
+                   export UNSIGNED_BUCKET=dummy_unsigned_bucket
+                   export SIGNED_BUCKET=dummy_signed_bucket
+                   export PROFILE_IDENTIFIER=null
+                   export PLATFORM_IDENTIFIER=null
+       
+>>>>>>> 700c80d (Add signer to support signing windows artifacts (#2156))
                    /tmp/workspace/sign.sh /tmp/workspace/maven --type=maven --platform=linux
                )
          release-data-prepper-all-artifacts.stage(Upload Artifacts to Sonatype, groovy.lang.Closure)
diff --git a/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt b/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt
index 18b4c7d2f7..f752f82494 100644
--- a/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt
+++ b/tests/jenkins/jobs/PromoteYumRepos_Jenkinsfile.txt
@@ -44,16 +44,11 @@
 
     )
                      promoteYumRepos.signArtifacts({artifactPath=/tmp/workspace/artifacts/releases/bundle/opensearch/1.x/yum/repodata/repomd.pom, sigtype=.sig, platform=linux})
-<<<<<<< HEAD
                         signArtifacts.echo(PGP or Windows Signature Signing)
-=======
-                        signArtifacts.echo(PGP Signature Signing)
->>>>>>> 071d6df (Update remaining env vars with credentials in jenkins libraries  (#2286))
                         signArtifacts.fileExists(/tmp/workspace/sign.sh)
                         signArtifacts.git({url=https://github.com/opensearch-project/opensearch-build.git, branch=main})
                         signArtifacts.sh(curl -sSL https://artifacts.opensearch.org/publickeys/opensearch.pgp | gpg --import -)
                         signArtifacts.usernamePassword({credentialsId=github_bot_token_name, usernameVariable=GITHUB_USER, passwordVariable=GITHUB_TOKEN})
-<<<<<<< HEAD
                         signArtifacts.string({credentialsId=jenkins-signer-client-role, variable=SIGNER_CLIENT_ROLE})
                         signArtifacts.string({credentialsId=jenkins-signer-client-external-id, variable=SIGNER_CLIENT_EXTERNAL_ID})
                         signArtifacts.string({credentialsId=jenkins-signer-client-unsigned-bucket, variable=SIGNER_CLIENT_UNSIGNED_BUCKET})
@@ -69,21 +64,6 @@
 
                    /tmp/workspace/sign.sh /tmp/workspace/artifacts/releases/bundle/opensearch/1.x/yum/repodata/repomd.pom --sigtype=.sig --platform=linux
                )
-=======
-                        signArtifacts.string({credentialsId=jenkins-signer-client-creds, variable=signer_client_creds})
-                        signArtifacts.withCredentials([[GITHUB_USER, GITHUB_TOKEN], signer_client_creds], groovy.lang.Closure)
-                           signArtifacts.readJSON({text=signer_client_creds})
-                           signArtifacts.sh(
-                #!/bin/bash
-                set +x
-                export ROLE=dummy_role
-                export EXTERNAL_ID=dummy_ID
-                export UNSIGNED_BUCKET=dummy_unsigned_bucket
-                export SIGNED_BUCKET=dummy_signed_bucket
-
-                /tmp/workspace/sign.sh /tmp/workspace/artifacts/releases/bundle/opensearch/1.x/yum/repodata/repomd.pom --sigtype=.sig --platform=linux
-            )
->>>>>>> 071d6df (Update remaining env vars with credentials in jenkins libraries  (#2286))
                      promoteYumRepos.sh(
             set -e
             set +x