diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index f6265977c1..1cc63bf633 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -1,7 +1,7 @@
 name: Components Checks
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index f85048c674..83b397bc52 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -2,7 +2,7 @@
 name: Codespell
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/flytectl-install.yml b/.github/workflows/flytectl-install.yml
index f2af37f99b..cbdb3795e9 100644
--- a/.github/workflows/flytectl-install.yml
+++ b/.github/workflows/flytectl-install.yml
@@ -1,7 +1,7 @@
 name: Flytectl-specific checks
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/flyteidl-checks.yml b/.github/workflows/flyteidl-checks.yml
index 89f1fc5c81..aa6ff0f652 100644
--- a/.github/workflows/flyteidl-checks.yml
+++ b/.github/workflows/flyteidl-checks.yml
@@ -1,7 +1,7 @@
 name: Flyteidl Verification Tests
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/helm-charts.yaml b/.github/workflows/helm-charts.yaml
index 5d5f4ca880..63e81adf3a 100644
--- a/.github/workflows/helm-charts.yaml
+++ b/.github/workflows/helm-charts.yaml
@@ -1,7 +1,7 @@
 name: Package & Push Flyte Helm Charts
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/sandbox.yml b/.github/workflows/sandbox.yml
index 83494a0f29..0899ec83e6 100644
--- a/.github/workflows/sandbox.yml
+++ b/.github/workflows/sandbox.yml
@@ -1,7 +1,7 @@
 name: Build & Push Sandbox Docker Image
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/single-binary.yml b/.github/workflows/single-binary.yml
index 39f50b35cf..ce5411328c 100644
--- a/.github/workflows/single-binary.yml
+++ b/.github/workflows/single-binary.yml
@@ -1,7 +1,7 @@
 name: Build & Push Flyte Single Binary Images
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 on:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3ec83f10e7..b7c76cff20 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,7 +1,7 @@
 name: tests
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 on:
diff --git a/flytectl/.github/PULL_REQUEST_TEMPLATE.md b/flytectl/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 97321913f9..0000000000
--- a/flytectl/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,32 +0,0 @@
-## Read then delete
-
-- Make sure to use a concise title for the pull-request.
-- Use #patch, #minor #majora or #none in the pull-request title to bump the corresponding version. Otherwise, the patch version
-  will be bumped. [More details](https://github.com/marketplace/actions/github-tag-bump)
-
-# TL;DR
-_Please replace this text with a description of what this PR accomplishes._
-
-## Type
-- [ ] Bug Fix
-- [ ] Feature
-- [ ] Plugin
-
-## Are all requirements met?
-
-- [ ] Code completed
-- [ ] Smoke tested
-- [ ] Unit tests added
-- [ ] Code documentation added
-- [ ] Any pending items have an associated Issue
-
-## Complete description
-_How did you fix the bug, make the feature etc. Link to any design docs etc_
-
-## Tracking Issue
-https://github.com/flyteorg/flyte/issues/<number>
-
-## Follow-up issue
-_NA_
-OR
-_https://github.com/flyteorg/flyte/issues/<number>_
diff --git a/flytectl/.github/workflows/checks.yml b/flytectl/.github/workflows/checks.yml
deleted file mode 100644
index 0be391bd3b..0000000000
--- a/flytectl/.github/workflows/checks.yml
+++ /dev/null
@@ -1,165 +0,0 @@
-name: Flytectl Checks
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - master
-    paths-ignore:
-      - "docs/**"
-      - "boilerplate/**"
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - "docs/**"
-      - "boilerplate/**"
-
-jobs:
-  lint:
-    name: Lint
-    uses: flyteorg/flytetools/.github/workflows/lint.yml@master
-    with:
-      go-version: 1.19
-
-  tests:
-    name: Unit Tests
-    uses: flyteorg/flytetools/.github/workflows/tests.yml@master
-    secrets:
-      FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
-    with:
-      go-version: 1.19
-
-  generate:
-    name: Check Go Gennerate
-    uses: flyteorg/flytetools/.github/workflows/go_generate.yml@master
-    with:
-      go-version: 1.19
-
-  dry_run_goreleaser:
-    name: Dry Run Goreleaser
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: "2"
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('go.sum') }}
-      - uses: actions/setup-go@v4
-        with:
-          go-version: '1.19'
-      - name: Run GoReleaser dry run
-        uses: goreleaser/goreleaser-action@v2
-        with:
-          version: latest
-          args: --snapshot  --skip-publish --rm-dist
-
-  sandbox:
-    name: Test Getting started
-    runs-on: ubuntu-latest
-    steps:
-      - uses: insightsengineering/disk-space-reclaimer@v1
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('go.sum') }}
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: 1.19
-      - name: Build Flytectl binary
-        run: make compile
-      - name: Create a sandbox cluster
-        run: |
-          bin/flytectl demo start
-          # Sleep is necessary here since `flyte-proxy` might not be ready
-          # to serve requests when the above command exits successfully.
-          # Fixed in: https://github.com/flyteorg/flyte/pull/4348
-          # TODO (jeev): Remove this when ^ is released.
-          sleep 10
-      - name: Setup flytectl config
-        run: bin/flytectl config init
-      - name: Register cookbook
-        run: bin/flytectl register examples -d development  -p flytesnacks
-      - name: Teardown Sandbox cluster
-        run: bin/flytectl sandbox teardown
-
-  bump_version:
-    name: Bump Version
-    if: ${{ github.event_name != 'pull_request' }}
-    needs: [ lint, tests, generate, dry_run_goreleaser, sandbox ] # Only to ensure it can successfully build
-    uses: flyteorg/flytetools/.github/workflows/bump_version.yml@master
-    secrets:
-      FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
-
-  generate_docs:
-    name: Generate documentation
-    needs: [ bump_version ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          lfs: true
-      - uses: actions/setup-go@v4
-        with:
-          go-version: '1.19'
-      - uses: actions/setup-python@v1
-        with:
-          python-version: 3.8
-      - uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: docs-pip-${{ runner.os }}-${{ hashFiles('doc-requirements.txt') }}-${{ hashFiles('doc-requirements.in') }}
-          restore-keys: docs-pip-
-      - uses: crazy-max/ghaction-import-gpg@v3
-        with:
-          gpg-private-key: ${{ secrets.FLYTE_BOT_GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.FLYTE_BOT_GPG_PASSPHRASE }}
-          git-user-signingkey: true
-          git-commit-gpgsign: true
-      - name: Install Dependencies
-        run: |
-          # Install all requirments
-          pip install -r doc-requirements.txt
-      - name: Generate documentation
-        run: |
-          make -C docs gendocs
-      - name: Create Pull Request
-        id: cpr
-        uses: peter-evans/create-pull-request@v3
-        with:
-          token: ${{ secrets.FLYTE_BOT_PAT }}
-          commit-message: Update documentation
-          committer: Flyte-Bot <admin@flyte.org>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          signoff: true
-          branch: flyte-bot-update-documentation
-          delete-branch: true
-          title: 'Update documentation'
-          body: |
-            Update documentation
-            - Auto-generated by [flyte-bot]
-          labels: |
-            documentation
-          draft: false
-
-  goreleaser:
-    name: Goreleaser
-    needs: [ bump_version ] # Only to ensure it can successfully build
-    uses: flyteorg/flytetools/.github/workflows/goreleaser.yml@master
-    with:
-      # https://github.com/docker/cli/issues/4437 describes an issue that affects the latest
-      # version of go 1.19 and 1.20, so pinning to latest known good version for now.
-      go-version: "1.19.10"
-    secrets:
-      FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}
-
diff --git a/flytectl/.github/workflows/monodocs_build.yml b/flytectl/.github/workflows/monodocs_build.yml
deleted file mode 100644
index a2610915fb..0000000000
--- a/flytectl/.github/workflows/monodocs_build.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-name: Monodocs Build
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-jobs:
-  docs:
-    name: Monodocs Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Fetch flytectl code
-        uses: actions/checkout@v4
-        with:
-          path: "${{ github.workspace }}/flytectl"
-      - name: Fetch flyte code
-        uses: actions/checkout@v4
-        with:
-          repository: flyteorg/flyte
-          path: "${{ github.workspace }}/flyte"
-      - uses: conda-incubator/setup-miniconda@v3
-        with:
-          auto-update-conda: true
-          python-version: 3.9
-      - shell: bash -el {0}
-        working-directory: ${{ github.workspace }}/flyte
-        run: |
-          conda install -c conda-forge conda-lock
-          conda-lock install -n monodocs-env monodocs-environment.lock.yaml
-      - shell: bash -el {0}
-        working-directory: ${{ github.workspace }}/flyte
-        run: |
-          conda activate monodocs-env
-          pip install ./flyteidl
-          conda info
-          conda list
-          conda config --show-sources
-          conda config --show
-          printenv | sort
-      - name: Build the documentation
-        working-directory: ${{ github.workspace }}/flyte
-        shell: bash -el {0}
-        env:
-          FLYTECTL_LOCAL_PATH: ${{ github.workspace }}/flytectl
-        run: |
-          conda activate monodocs-env
-          make -C docs clean html SPHINXOPTS="-W -vvv"
diff --git a/flytectl/.github/workflows/upgrade_automation.yml b/flytectl/.github/workflows/upgrade_automation.yml
deleted file mode 100644
index a087b8fd04..0000000000
--- a/flytectl/.github/workflows/upgrade_automation.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Upgrade Automation
-on:
-  workflow_dispatch:
-    inputs:
-      component:
-        description: "Name of Flyte component"
-        required: true
-        default: "boilerplate"
-        type: choice
-        options:
-          - boilerplate
-          - flyteidl
-          - flytestdlib
-jobs:
-  trigger-upgrade:
-    name: ${{ github.event.inputs.component }} Upgrade
-    uses: flyteorg/flytetools/.github/workflows/flyte_automation.yml@master
-    with:
-      component: ${{ github.event.inputs.component }}
-    secrets:
-      FLYTE_BOT_PAT: ${{ secrets.FLYTE_BOT_PAT }}