diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 000000000..ac7f3daf5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,52 @@
+name: ๐ Bug Report
+description: Report something that's broken, or not working like intented!
+title: '[๐ Bug]
'
+labels: ['๐ Bug']
+assignees:
+ - ajnart
+body:
+ - type: dropdown
+ id: environment
+ attributes:
+ label: Environment
+ description: How have you deployed Homarr?
+ options:
+ - Docker
+ - NodeJS
+ - Cloud Service (Static)
+ validations:
+ required: true
+ - type: input
+ id: version
+ attributes:
+ label: Version
+ description: What version of Homarr are you running?
+ placeholder: 0.1.0
+ validations:
+ required: false
+ - type: textarea
+ id: repro
+ attributes:
+ label: Describe the problem
+ description: Please describe the problem exactly, how to reproduce it, actual results, and expected results.
+ validations:
+ required: true
+ - type: textarea
+ id: logs
+ attributes:
+ label: Additional info
+ description: Logs? Screenshots? More info?
+ validations:
+ required: false
+ - type: checkboxes
+ id: idiot-check
+ attributes:
+ label: Please tick the boxes
+ description: Before submitting, please ensure that
+ options:
+ - label: You've read the [docs](https://github.com/ajnart/homarr#readme)
+ required: true
+ - label: You've checked for [duplicate issues](https://github.com/ajnart/homarr/issues)
+ required: true
+ - label: You've tried to debug yourself
+ required: true
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 000000000..4a4844335
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,25 @@
+name: โจ Feature Request
+description: Request a feature to help improve Homarr!
+title: '[โจ Feature] '
+labels: ['โจ Feature']
+assignees:
+ - ajnart
+body:
+ - type: textarea
+ id: feature
+ attributes:
+ label: Describe the feature you would like to see
+ placeholder: An outline of the feature you would like to see implemented, include as much detail as possible!
+ validations:
+ required: true
+ - type: dropdown
+ id: priority
+ attributes:
+ label: Priority
+ description: How urgent is the development of this feature?
+ options:
+ - Low (Nice-to-have)
+ - Medium (Would be very useful)
+ - High (App breaking feature)
+ validations:
+ required: true
diff --git a/README.md b/README.md
index 9e6b45ce6..a9adae83c 100644
--- a/README.md
+++ b/README.md
@@ -1,33 +1,86 @@
-# MyHomePage, a home page for your home server
-### Do not hesitate to star โญ this repo if you like the project ! 
-### Join the discord ! : https://discord.gg/C2WTXkzkwK
-## What is MyHomePage ?
+
+
Homarr
-HomePage is a web page for your home server, it provides a user friendly interface to access docker containers or other services.
+