diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..1b1d6f77
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,19 @@
+# Default owners for everything in the repo.
+# Unless a later match takes precedence, the Maintainers team
+# will be requested for review when someone opens a pull request.
+*       @open-component-model/Maintainers
+
+# Changes on repository settings require admin permissions
+/.github/settings.yml   @open-component-model/admins
+/.github/CODEOWNERS     @open-component-model/admins
+
+# Owners for specific directories
+#/docs/  @<org>/<team>
+#/src/   @<org>/<team>
+
+# Owners for specific file types
+#*.md    @<org>/<team>
+#*.go    @<org>/<team>
+
+# Individual users as owners, e.g. a lead maintainer for a specific component:
+# /src/critical-component/   @lead-maintainer-username
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c445a72f..d84afb42 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: "[BUG] ---"
-labels: kind/bug
+labels: kind/bugfix
 assignees: ''
 
 ---
@@ -12,6 +12,7 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -24,15 +25,9 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+
+- OS: [e.g. iOS]
+- Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
index 48d5f81f..b9f8e5a7 100644
--- a/.github/ISSUE_TEMPLATE/custom.md
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -2,9 +2,7 @@
 name: Custom issue template
 about: Describe this issue template's purpose here.
 title: ''
-labels: ''
+labels: kind/chore
 assignees: ''
 
 ---
-
-
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index eae2f6e9..d681cbf0 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: kind/enhancement
+labels: kind/feature
 assignees: ''
 
 ---
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 89063839..d9fe330b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,7 @@
-#### What this PR does / why we need it:
+<!-- markdownlint-disable MD041 -->
+#### What this PR does / why we need it
 
-#### Which issue(s) this PR fixes:
+#### Which issue(s) this PR fixes
 <!--
 Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
 -->
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e3119390..073b7953 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,7 +3,6 @@ version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
-    labels: ["dependencies"]
     groups:
       # xref: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#groups
       ci:
@@ -12,12 +11,19 @@ updates:
     schedule:
       interval: "weekly"
       day: "sunday"
+    labels:
+      - kind/dependency
+      - kind/chore
+      - kind/skip-release-notes
+      - component/github-actions
   - package-ecosystem: "gomod"
     directory: "/"
-    labels: ["dependencies","go"]
     groups:
       go:
         update-types:  ["minor","patch"]
     schedule:
       interval: "weekly"
       day: "sunday"
+    labels:
+      - kind/dependency
+      - kind/chore
diff --git a/.github/settings.yml b/.github/settings.yml
new file mode 100644
index 00000000..ff975ad2
--- /dev/null
+++ b/.github/settings.yml
@@ -0,0 +1,8 @@
+# These settings are synced to GitHub by https://probot.github.io/apps/settings/
+
+# see: https://github.com/open-component-model/.github/blob/main/.github/settings.yml
+_extends: .github
+
+labels:
+- name: repo/ocm-k8s-toolkit
+  color: bfd4f2
diff --git a/.gitignore b/.gitignore
index 1520b68b..1747f991 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,5 @@ go.work.sum
 
 # goreleaser resources
 dist/
-output/
\ No newline at end of file
+output/
+/.project