diff --git a/.gitattributes b/.gitattributes
index 0ec794254f..f139ed5e4e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,9 +5,7 @@
 /.backportrc.json linguist-generated
 /.eslintrc.json linguist-generated
 /.gitattributes linguist-generated
-/.github/ISSUE_TEMPLATE/bug.md linguist-generated
 /.github/ISSUE_TEMPLATE/config.yml linguist-generated
-/.github/ISSUE_TEMPLATE/feature-request.md linguist-generated
 /.github/pull_request_template.md linguist-generated
 /.github/workflows/auto-approve.yml linguist-generated
 /.github/workflows/backport.yml linguist-generated
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
deleted file mode 100644
index 6d6e283281..0000000000
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-name: "\U0001F41B Bug Report"
-about: Report a bug
-title: ''
-labels: bug, needs-triage
-assignees: ''
-
----
-
-<!--Please make sure to read the "Reporting Issues" section of the contribution guide before submitting an issue
-https://github.com/cdk8s-team/cdk8s/blob/master/CONTRIBUTING.md#reporting-issues
--->
-
-### Description of the bug:
-<!--description of the bug:-->
-
-
-
-
-
-
-### Reproduction Steps:
-<!--minimal amount of code that causes the bug (if possible) or a reference:-->
-
-
-
-
-
-### Error Log:
-<!--what is the error message you are seeing?-->
-
-
-
-
-### Environment:
-
-
-  - **Framework Version**:
-  - **OS**:
-
-
-### Other:
-<!-- e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix, links for us to have context, eg. associated pull-request, stackoverflow, gitter, etc -->
-
-
-
-
----
-
-This is :bug: Bug Report
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 97067033ad..a7aeab0cab 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -11,3 +11,6 @@ contact_links:
   - name: GitHub Community Support
     url: https://github.com/cdk8s-team/cdk8s-core/discussions
     about: Please ask and answer questions here.
+  - name: Open a cdk8s issue
+    url: https://github.com/cdk8s-team/cdk8s/issues/new/choose
+    about: All cdk8s issues are tracked in the cdk8s repository.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
deleted file mode 100644
index 4897c0c885..0000000000
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-name: "\U0001F680 Feature Request"
-about: Request a new feature
-title: ''
-labels: feature-request, needs-triage
-assignees: ''
-
----
-
-<!--Please make sure to read the "Reporting Issues" section of the contribution guide before submitting an issue
-https://github.com/cdk8s-team/cdk8s/blob/master/CONTRIBUTING.md#reporting-issues
--->
-
-### Description of the feature or enhancement:
-<!-- short description of the feature you are proposing: -->
-
-
-
-
-
-### Use Case:
-<!-- why do you need this feature? -->
-
-
-
-
-
-### Proposed Solution:
-<!-- Please include prototype/workaround/sketch/reference implementation: -->
-
-
-
-
-
-### Other:
-<!--
-e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix,
-links for us to have context, eg. associated pull-request, stackoverflow, gitter, etc
--->
-
-
-
-
-
-* [ ] :wave: I may be able to implement this feature request
-* [ ] :warning: This feature might incur a breaking change
-
----
-
-This is a :rocket: Feature Request
\ No newline at end of file
diff --git a/.github/workflows/release-1.x.yml b/.github/workflows/release-1.x.yml
index 2c9095e3ea..500bc2f277 100644
--- a/.github/workflows/release-1.x.yml
+++ b/.github/workflows/release-1.x.yml
@@ -6,6 +6,9 @@ on:
     branches:
       - 1.x
   workflow_dispatch: {}
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -296,6 +299,3 @@ jobs:
           GIT_USER_EMAIL: cdk8s-team@amazon.com
           GITHUB_TOKEN: ${{ secrets.GO_GITHUB_TOKEN }}
         run: npx -p publib@latest publib-golang
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dbc7c9eab5..7a7aa087ec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,6 +6,9 @@ on:
     branches:
       - 2.x
   workflow_dispatch: {}
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -296,6 +299,3 @@ jobs:
           GIT_USER_EMAIL: cdk8s-team@amazon.com
           GITHUB_TOKEN: ${{ secrets.GO_GITHUB_TOKEN }}
         run: npx -p publib@latest publib-golang
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: false
diff --git a/.gitignore b/.gitignore
index d126ee9897..f4b07e58cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,8 +58,6 @@ tsconfig.json
 !/git-hooks/README.md
 !/git-hooks/setup.sh
 !/.github/ISSUE_TEMPLATE/config.yml
-!/.github/ISSUE_TEMPLATE/bug.md
-!/.github/ISSUE_TEMPLATE/feature-request.md
 !/SECURITY.md
 !/.github/workflows/security.yml
 !/.github/workflows/triage.yml
diff --git a/.projen/files.json b/.projen/files.json
index a34f4e4969..7af7f8401e 100644
--- a/.projen/files.json
+++ b/.projen/files.json
@@ -3,9 +3,7 @@
     ".backportrc.json",
     ".eslintrc.json",
     ".gitattributes",
-    ".github/ISSUE_TEMPLATE/bug.md",
     ".github/ISSUE_TEMPLATE/config.yml",
-    ".github/ISSUE_TEMPLATE/feature-request.md",
     ".github/pull_request_template.md",
     ".github/workflows/auto-approve.yml",
     ".github/workflows/backport.yml",
diff --git a/package.json b/package.json
index a072106250..847445c37a 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "organization": false
   },
   "devDependencies": {
-    "@cdk8s/projen-common": "^0.0.545",
+    "@cdk8s/projen-common": "^0.0.546",
     "@types/follow-redirects": "^1.14.4",
     "@types/jest": "^27",
     "@types/node": "16.18.78",
@@ -66,7 +66,7 @@
     "jsii-pacmak": "^1.103.1",
     "jsii-rosetta": "^5",
     "json-schema-to-typescript": "^10.1.5",
-    "projen": "^0.87.2",
+    "projen": "^0.87.3",
     "ts-jest": "^27",
     "typescript": "~5.6.2"
   },
diff --git a/yarn.lock b/yarn.lock
index e03e90f5f3..f155c28391 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -294,10 +294,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@cdk8s/projen-common@^0.0.545":
-  version "0.0.545"
-  resolved "https://registry.yarnpkg.com/@cdk8s/projen-common/-/projen-common-0.0.545.tgz#ce6ce878f767d2eaa0200d5d97719e6740b4822a"
-  integrity sha512-QMjv2z0fe+kxnYGUOIypQlsRa/k+va/unhrD/B6IA9RNJ+QfDhx6AO+teazqr3FcNpJ5RoTin8gExqVHKWV3sA==
+"@cdk8s/projen-common@^0.0.546":
+  version "0.0.546"
+  resolved "https://registry.yarnpkg.com/@cdk8s/projen-common/-/projen-common-0.0.546.tgz#ff33475c59e9f9f28f4388dcf4567de85b681250"
+  integrity sha512-UO4kc0VajrtDcIIzK1LvjLejk40FlG/99IAvQ28yI0xI5F497CsSh2v/XR4Orewb4dMWmOMhA1HA4Z8YqcGnqA==
   dependencies:
     codemaker "^1.103.1"
     deepmerge "^4.3.1"
@@ -5286,10 +5286,10 @@ process-warning@^1.0.0:
   resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-1.0.0.tgz#980a0b25dc38cd6034181be4b7726d89066b4616"
   integrity sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q==
 
-projen@^0.87.2:
-  version "0.87.2"
-  resolved "https://registry.yarnpkg.com/projen/-/projen-0.87.2.tgz#0e91c139233fc8d36101e193ddcce75a21930226"
-  integrity sha512-O9qglXmlfuWd58xl1iTRvwIRzb5kNU/DS1kTYYIdQQlwcmlMG6+q0HbdhkkSnkwdqorqflQK1VpVeKF1vC//zg==
+projen@^0.87.3:
+  version "0.87.3"
+  resolved "https://registry.yarnpkg.com/projen/-/projen-0.87.3.tgz#2cc9df7bf934d4cf7c717b1f43df15064a78c6cb"
+  integrity sha512-eNaXICh0xc5xzdvd8ZBqK5emcPPARgTGqf8qcfuEcnRdM3nO6SuXzl9k/QzkLaOJU/Fcrcv+XYSXtukHK+RPuA==
   dependencies:
     "@iarna/toml" "^2.2.5"
     case "^1.6.3"