diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..ff5181e0d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+---
+
+**Describe the bug**
+Please provide a clear and concise description of what the bug is.
+ - Pyaerocom version:
+ - Computing platform:
+ - Configuration file (if applicable):
+ - Error message (if applicable):
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1.
+2.
+3.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..f10fee395
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Pyaerocom documentation
+    url: https://pyaerocom.readthedocs.io/en/latest/
+    about: Documentation page for Pyaerocom
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
new file mode 100644
index 000000000..d5c8043f6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,17 @@
+---
+name: Documentation
+about: Suggest changes in the documentation.
+title: ''
+labels: documentation
+
+---
+
+**Describe a problem and/or suggest an improvement**
+ - Something incorrect or unclear in the documentation?
+ - Something should be added to the documentation?
+ - Something should be removed from the documentation?
+ - Something should be re-structured in the documentation?
+ - Suggest a Q&A for the FAQ?
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..e54d46f30
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is.
+
+**Describe the solution you would like to see**
+A clear and concise description of what you want to happen.
+ - Would you be able to work on this solution yourself?
+ - How can the Pyaerocom development team assist you?
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/general_issue.md b/.github/ISSUE_TEMPLATE/general_issue.md
new file mode 100644
index 000000000..7a908e008
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/general_issue.md
@@ -0,0 +1,7 @@
+---
+name: General issue
+about: Used for general issues, not covered by other templates.
+title: ''
+labels: ''
+
+---
\ No newline at end of file
diff --git a/tests/plugins/gaw/test_dms.py b/tests/plugins/gaw/test_dms.py
index 92cf7ae56..8c1a62f39 100644
--- a/tests/plugins/gaw/test_dms.py
+++ b/tests/plugins/gaw/test_dms.py
@@ -12,7 +12,6 @@ def _make_data():
 
 
 @pytest.fixture(scope="module")
-@lustre_unavail
 def data_vmrdms_ams_cvo():
     return _make_data()
 
diff --git a/tests/plugins/ipcforests/test_reader.py b/tests/plugins/ipcforests/test_reader.py
index 8fb680b8f..00169fe39 100644
--- a/tests/plugins/ipcforests/test_reader.py
+++ b/tests/plugins/ipcforests/test_reader.py
@@ -51,7 +51,7 @@ def test_METADATA(meta_reader: ReadIPCForestMeta):
 
 
 def test_PROVIDES_VARIABLES(reader: ReadIPCForest):
-    return set(reader.PROVIDES_VARIABLES) >= VARS_PROVIDED
+    assert set(reader.PROVIDES_VARIABLES) >= VARS_PROVIDED
 
 
 def test_read_file(
diff --git a/tests/plugins/mep/test_reader.py b/tests/plugins/mep/test_reader.py
index 149000125..d997e969b 100644
--- a/tests/plugins/mep/test_reader.py
+++ b/tests/plugins/mep/test_reader.py
@@ -63,7 +63,7 @@ def test_stations(reader: ReadMEP, station: str):
 
 @lustre_unavail
 def test_PROVIDES_VARIABLES(reader: ReadMEP):
-    return set(reader.PROVIDES_VARIABLES) >= VARS_PROVIDED
+    assert set(reader.PROVIDES_VARIABLES) >= VARS_PROVIDED
 
 
 @lustre_unavail