diff --git a/README.md b/README.md
index 853a365..c8daa63 100644
--- a/README.md
+++ b/README.md
@@ -34,27 +34,6 @@ ownCloud SMS (OcSMS) web application is currently under AGPL licence but this fr
 *Please create your core issues here:*
 https://github.com/nerzhul/ocsms/issues
 
-
-### Issue template 
-**Server**
-- ownCloud version: X.X.X
-- PHP version: X.X
-- HTTPd server: <apache|nginx...>
-- HTTPS: <yes|no>
-
-**Client**
-- Android version: X.X.X
-- Phone: <phone-model>
-- ownCloud SMS app version: X.X.X 
-
-**Content of /owncloud/data/owncloud.log**
-```
-Place content of your owncloud.log here
-```
-
-
 ### Android client issues
 *Please create your issues for the Android client here:*
 https://github.com/nerzhul/ownCloud-SMS-App/issues
-
-
diff --git a/issue_template.md b/issue_template.md
new file mode 100644
index 0000000..b1e5845
--- /dev/null
+++ b/issue_template.md
@@ -0,0 +1,40 @@
+<!--
+Thanks for reporting issues back to us! 
+
+To make it possible for us to help you please fill out below information carefully.
+--> 
+
+### Steps to reproduce
+1.
+2.
+3.
+
+### Expected behaviour
+Tell us what should happen
+
+### Actual behaviour
+Tell us what happens instead
+
+### Server configuration
+
+**ownCloud version:** 
+
+**PHP version:**
+
+**HTTPd server:**
+
+**HTTPS:**
+
+### Client configuration
+
+**Android version:**
+
+**Phone:**
+
+**ownCloud SMS app version:**
+
+### Logs
+
+```
+Insert your log here
+```