diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 19e1726d1..b78c8e6fb 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -1,5 +1,9 @@
 name: Continuous Integration Workflow
 
+permissions:
+  contents: read
+  id-token: write
+
 on:
   pull_request:
   push:
diff --git a/codebuild/release/artifact-hunt.yml b/codebuild/release/artifact-hunt.yml
index 1fea3e11e..c871708e5 100644
--- a/codebuild/release/artifact-hunt.yml
+++ b/codebuild/release/artifact-hunt.yml
@@ -5,7 +5,7 @@ version: 0.2
 
 env:
   variables:
-    BRANCH: "main"
+    BRANCH: "main-3.x"
 
 phases:
   install:
diff --git a/codebuild/release/javadoc.yml b/codebuild/release/javadoc.yml
deleted file mode 100644
index 8e0fa0e4d..000000000
--- a/codebuild/release/javadoc.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
-## SPDX-License-Identifier: Apache-2.0
-
-version: 0.2
-
-env:
-  variables:
-    BRANCH: "main"
-    GH_PAGES: "gh-pages"
-  git-credential-helper: yes
-
-phases:
-  pre_build:
-    commands:
-      - git config --global user.name "aws-crypto-tools-ci-bot"
-      - git config --global user.email "no-reply@noemail.local"
-      - git checkout $BRANCH
-  build:
-    commands:
-      - mvn javadoc:javadoc
-      - cp -r ./target/reports/apidocs /tmp
-      - git checkout $GH_PAGES
-      - cp -r /tmp/apidocs/* .
-      - git add .
-      - 'git commit -m "docs: updating javadocs"'
-      - git push -u origin $GH_PAGES
diff --git a/codebuild/release/release-prod.yml b/codebuild/release/release-prod.yml
index c833ca19a..1384e4a6b 100644
--- a/codebuild/release/release-prod.yml
+++ b/codebuild/release/release-prod.yml
@@ -6,7 +6,7 @@ version: 0.2
 
 env:
   variables:
-    BRANCH: "main"
+    BRANCH: "main-3.x"
   secrets-manager:
     GPG_KEY: Maven-GPG-Keys-Release-Credentials:Keyname
     GPG_PASS: Maven-GPG-Keys-Release-Credentials:Passphrase
diff --git a/codebuild/release/release.yml b/codebuild/release/release.yml
index e4042b4ed..aac7be825 100644
--- a/codebuild/release/release.yml
+++ b/codebuild/release/release.yml
@@ -84,13 +84,3 @@ batch:
       # standard:6.0 (Ubuntu) supports GH CLI; AL2 does not
       image: aws/codebuild/standard:6.0
 
-  # Generate and update new javadocs
-  - identifier: update_javadoc
-    depend-on:
-      - upload_artifacts
-    buildspec: codebuild/release/javadoc.yml
-    env:
-      variables:
-        JAVA_ENV_VERSION: corretto11
-        JAVA_NUMERIC_VERSION: 11
-      image: aws/codebuild/amazonlinux2-x86_64-standard:3.0
diff --git a/codebuild/release/upload_artifacts.yml b/codebuild/release/upload_artifacts.yml
index 95515f0f7..b69b45cfa 100644
--- a/codebuild/release/upload_artifacts.yml
+++ b/codebuild/release/upload_artifacts.yml
@@ -5,7 +5,7 @@ version: 0.2
 
 env:
   variables:
-    BRANCH: "main"
+    BRANCH: "main-3.x"
   git-credential-helper: yes
   parameter-store:
     ACCOUNT: /CodeBuild/AccountId
diff --git a/codebuild/release/version.yml b/codebuild/release/version.yml
index ad18db28e..f7f25e457 100644
--- a/codebuild/release/version.yml
+++ b/codebuild/release/version.yml
@@ -6,7 +6,7 @@ version: 0.2
 env:
   variables:
     NODE_OPTIONS: "--max-old-space-size=4096"
-    BRANCH: "main"
+    BRANCH: "main-3.x"
   git-credential-helper: "yes"
   secrets-manager:
     GH_TOKEN: Github/aws-crypto-tools-ci-bot:ESDK Release Token
@@ -31,4 +31,4 @@ phases:
   build:
     commands:
       # semantic-release uses config stored in ~/.releaserc
-      - npx semantic-release --branches $BRANCH --no-ci
\ No newline at end of file
+      - npx semantic-release --branches $BRANCH --no-ci