diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..33de897a1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,17 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+## URL address of the page where you encountered the problem
+
+## Description of the problem
+Steps to produce the problem, and the expected outcome after it has been fixed
+
+## Additional information (e.g. screenshots) about the problem
+
+## The browser you used when the problem appeared
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..65fa94957
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,16 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+## Description of the enhancement
+
+## Who are the users that would benefit from the enhancement and how?
+
+## What new functionalities would the enhancement make possible?
+
+## Why is the enhancement important?
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index c8efe59b4..000000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,10 +0,0 @@
-## At which URL did you encounter the problem?
-
-## What steps will reproduce the problem?
-1.
-2.
-3.
-
-## What is the expected output? What do you see instead?
-
-## What browser did you use? (eg. Firefox, Chrome, Safari, Internet explorer)
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index e5e54e6bb..f434a4458 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -9,5 +9,12 @@
     putenv('SKOSMOS_SPARQL_ENDPOINT=http://localhost:13030/skosmos-test/sparql');
 }
 
+# Allow running git commands in the php-actions/phpunit container
+# (prevent "dubious ownership" error; /app is owned by another user, not root)
+if (getenv('GITHUB_ACTIONS') === 'true' ) {
+  mkdir('/home/runner');
+  exec('git config --global --add safe.directory /app');
+}
+
 require_once(__DIR__ . '/../vendor/autoload.php');
 require_once(__DIR__ . '/../model/Model.php');