diff --git a/.github/ISSUE_TEMPLATE/commercial-bug-report.yml b/.github/ISSUE_TEMPLATE/commercial-bug-report.yml
deleted file mode 100644
index fe8f7439..00000000
--- a/.github/ISSUE_TEMPLATE/commercial-bug-report.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: "Commercial License : Bug Report"
-description: |
-  Create a report to help us improve the project. For Commercial License holders only.
-  Please contact help@sixlabors.com for issues requiring private support.
-labels: ["commercial", "needs triage"]
-body:
-- type: checkboxes
-  attributes:
-    label: Prerequisites
-    options:
-      - label: I have bought a Commercial License
-        required: true
-      - label: I have written a descriptive issue title
-        required: true
-      - label: I have verified that I am running the latest version of ImageSharp.Web
-        required: true
-      - label: I have verified if the problem exist in both `DEBUG` and `RELEASE` mode
-        required: true
-      - label: I have searched [open](https://github.com/SixLabors/ImageSharp.Web/issues) and [closed](https://github.com/SixLabors/ImageSharp.Web/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported
-        required: true
-- type: input
-  attributes:
-    label: ImageSharp.Web version
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Other Six Labors packages and versions
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Environment (Operating system, version and so on)
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: .NET Framework version
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Description
-    description: A description of the bug
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Steps to Reproduce
-    description: List of steps, sample code, failing test or link to a project that reproduces the behavior. Make sure you place a stack trace inside a code (```) block to avoid linking unrelated issues.
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Images
-    description: Please upload images that can be used to reproduce issues in the area below. If the file type is not supported the file can be zipped and then uploaded instead.
diff --git a/.github/ISSUE_TEMPLATE/oss-bug-report.yml b/.github/ISSUE_TEMPLATE/oss-bug-report.yml
index 8ba2861f..020bef57 100644
--- a/.github/ISSUE_TEMPLATE/oss-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/oss-bug-report.yml
@@ -1,5 +1,5 @@
-name: "OSS : Bug Report"
-description: Create a report to help us improve the project. OSS Issues are not guaranteed to be triaged.
+name: "Bug Report"
+description: Create a report to help us improve the project. Issues are not guaranteed to be triaged.
 labels: ["needs triage"]
 body:
 - type: checkboxes
@@ -31,7 +31,7 @@ body:
     required: true
 - type: input
   attributes:
-    label: .NET Framework version
+    label: .NET version
   validations:
     required: true
 - type: textarea
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index b34bbb41..365f69e2 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,3 +1,2 @@
-# Code of Conduct  
+# Code of Conduct  
 This project has adopted the code of conduct defined by the [Contributor Covenant](https://contributor-covenant.org/) to clarify expected behavior in our community.
-For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
\ No newline at end of file
diff --git a/ImageSharp.Web.sln b/ImageSharp.Web.sln
index 71cf37d3..4e1781f8 100644
--- a/ImageSharp.Web.sln
+++ b/ImageSharp.Web.sln
@@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_root", "_root", "{C317F1B1
 		ci-build.ps1 = ci-build.ps1
 		ci-pack.ps1 = ci-pack.ps1
 		ci-test.ps1 = ci-test.ps1
-		.github\CONTRIBUTING.md = .github\CONTRIBUTING.md
+		CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		LICENSE = LICENSE
@@ -44,14 +44,19 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSharp.Web.Providers.AWS", "src\ImageSharp.Web.Providers.AWS\ImageSharp.Web.Providers.AWS.csproj", "{E631D300-ACD5-40EA-A6BB-08E22092EC76}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{B8152C86-B657-4967-B297-42F89A10D23A}"
+	ProjectSection(SolutionItems) = preProject
+		.github\CONTRIBUTING.md = .github\CONTRIBUTING.md
+		.github\dependabot.yml = .github\dependabot.yml
+		.github\FUNDING.yml = .github\FUNDING.yml
+		.github\PULL_REQUEST_TEMPLATE.md = .github\PULL_REQUEST_TEMPLATE.md
+	EndProjectSection
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharedInfrastructure", "shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.shproj", "{68A8CC40-6AED-4E96-B524-31B1158FDEEA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{04955CD1-F249-4899-9F61-6C7487BEECE1}"
 	ProjectSection(SolutionItems) = preProject
-		.github\ISSUE_TEMPLATE\commercial-bug-report.md = .github\ISSUE_TEMPLATE\commercial-bug-report.md
 		.github\ISSUE_TEMPLATE\config.yml = .github\ISSUE_TEMPLATE\config.yml
-		.github\ISSUE_TEMPLATE\oss-bug-report.md = .github\ISSUE_TEMPLATE\oss-bug-report.md
+		.github\ISSUE_TEMPLATE\oss-bug-report.yml = .github\ISSUE_TEMPLATE\oss-bug-report.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{2A5EF4AC-E228-42C1-970B-35630A9AF250}"