diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 358b5dc40..30b227d04 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Bug report
 about: Omega is not working like it should? Let us know!
 title: ''
-labels: Triage
+labels: Bug, Triage
 assignees: ''
 
 ---
@@ -11,4 +11,4 @@ assignees: ''
 
 
 #### Environment
- - Omega Version: { go to settings > about > Omega Version and type version here}
+ - Omega Version: {go to settings > about > Omega Version and type the version here}
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index b06d63f4d..eee03aa6a 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 an improvement of Omega
 title: ''
-labels: Triage
+labels: Feature, Triage
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/problems-during-installation.md b/.github/ISSUE_TEMPLATE/problems-during-installation.md
new file mode 100644
index 000000000..c9fe25a0f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/problems-during-installation.md
@@ -0,0 +1,19 @@
+---
+name: Problems during installation
+about: Create a report to help us improve
+title: ''
+labels: Installation issue, Triage
+assignees: ''
+
+---
+
+#### Describe the problem
+
+
+#### Logs
+```
+Copy/paste the logs here (If you have some)
+```
+
+#### Environment
+ - Omega Version: {go to settings > about > Omega Version and type the version here}
diff --git a/build/config.mak b/build/config.mak
index 0d3568c60..9ff5bf0ec 100644
--- a/build/config.mak
+++ b/build/config.mak
@@ -4,7 +4,7 @@ PLATFORM ?= device
 DEBUG ?= 0
 
 EPSILON_VERSION ?= 12.0.0
-EPSILON_CUSTOM_VERSION ?= 1.18.0-0
+EPSILON_CUSTOM_VERSION ?= 1.18.4-0
 # USERNAME ?= N/A
 # Valid values are "none", "update", "beta"
 EPSILON_APPS ?= calculation rpn graph code statistics probability solver atom sequence regression settings external