diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..2051223
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,21 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ""
+labels: bug
+---
+
+**Chart type**
+Specify the chart type you experienced issues with (Memgraph Standalone, Memgraph HA,  Memgraph LAB)
+
+**Chart version:**
+Specify the version of the chart you are running.
+
+**What happened?**
+Describe the issue and what you expected to happen.
+
+**Environment:**
+Specify the environment where the issue occurred and how it could be related to the bug.
+
+**Relevant log output:**
+Please copy and paste any relevant log output from pods and containers.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
deleted file mode 100644
index 4f67ae6..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Bug Report
-description: File a bug report
-title: "[Bug]: "
-labels: ["bug"]
-assignees:
-- katarinasupe
-- antejavor
-body:
-- type: markdown
-  attributes:
-    value: |
-      ## Bug Report
-
-      **Chart type:**
-      _Specify the chart type you experienced issues with (Memgraph Standalone, Memgraph HA,  Memgraph LAB)_
-
-      **Chart version:**
-      _Specify the version of the chart you are running._
-
-      **What happened?**
-      _Describe the issue and what you expected to happen._
-
-      **Environment:**
-      _Specify the environment where the issue occurred and how it could be related to the bug._
-
-      **Relevant log output:**
-      _Please copy and paste any relevant log output from pods and containers._
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 947699f..df936e0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,9 +4,9 @@ repos:
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer
+  - id: check-json
   - id: check-yaml
     exclude: ^charts/(memgraph|memgraph-lab|memgraph-high-availability)/templates/
-  - id: check-json
   - id: mixed-line-ending
   - id: check-merge-conflict
   - id: detect-private-key
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f955a55..76c6811 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,7 +34,7 @@ There are two main types of contributions:
 1. **Bug fixes**
 2. **New features**
 
-Both types of fixes should be applied to the `release` branch, that is currently active based on the upcoming [milestone](https://github.com/memgraph/helm-charts/milestone/2) for example `release-0.1.3` branch.
+Both types of fixes should be applied to the `main` branch.
 
 In order for a pull request to be merged, a review by two code owners is required and the tests need to pass remotely.