diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index eeaf12b..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,12 +0,0 @@
-| Q                | A
-| ---------------- | -----
-| Bug report?      | yes/no
-| Feature request? | yes/no
-| BC Break report? | yes/no
-| RFC?             | yes/no
-
-<!--
-- Make sure to always try the latest version before opening an issue.
-- Please fill in this template according to your issue.
-- Replace this comment by the description of your issue.
--->
diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.md b/.github/ISSUE_TEMPLATE/1_Bug_report.md
new file mode 100644
index 0000000..1e26723
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1_Bug_report.md
@@ -0,0 +1,20 @@
+---
+name: "\U0001F41B Bug Report"
+about: Report errors and problems
+title: "[bug] "
+labels: Potential Bug
+assignees: ''
+
+---
+
+**Description**
+<!-- A clear and concise description of the problem. -->
+
+**How to reproduce**
+<!-- Code and/or config needed to reproduce the problem. -->
+
+**Possible Solution**
+<!--- Optional: only if you have suggestions on a fix/reason for the bug -->
+
+**Additional context**
+<!-- Optional: any other context about the problem: log messages, screenshots, etc. -->
diff --git a/.github/ISSUE_TEMPLATE/2_Feature-request.md b/.github/ISSUE_TEMPLATE/2_Feature-request.md
new file mode 100644
index 0000000..14886a9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2_Feature-request.md
@@ -0,0 +1,16 @@
+---
+name: "\U0001F680 Feature Request"
+about: "I have a suggestion (and may want to implement it \U0001F642)!"
+title: "[Feature] "
+labels: Feature
+assignees: ''
+
+---
+
+**Description**
+<!-- A clear and concise description of the new feature. -->
+
+**Example**
+<!-- A simple example of the new feature in action (include PHP code, YAML config, etc.)
+     If the new feature changes an existing feature, include a simple before/after comparison. -->
+
diff --git a/.github/ISSUE_TEMPLATE/3_Security-issue.md b/.github/ISSUE_TEMPLATE/3_Security-issue.md
new file mode 100644
index 0000000..ea75484
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3_Security-issue.md
@@ -0,0 +1,14 @@
+---
+name: ⛔ Security Issue
+about: Report security issues and problems (PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY)
+
+---
+
+⚠ PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, SEE BELOW.
+
+If you have found a security issue in this project, please send the details to
+security [at] rollerscapes.net and don't disclose it publicly until we can provide a
+fix for it.
+
+**Note:** Please don't blindly send reports about automated tools, make sure the
+reported issue is in fact exploitable. Thanks.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 73f1069..da9f029 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,5 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | main for features / 1.4 bug/translation fixes <!-- see below -->
 | Bug fix?      | yes/no
 | New feature?  | yes/no
 | BC breaks?    | yes/no
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0d729c6..df2c19d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -50,7 +50,7 @@ jobs:
 
             -
                 name: 'Check the code style'
-                run: 'make cs-full'
+                run: 'make cs'
 
     phpstan:
         name: 'PhpStan'
diff --git a/Makefile b/Makefile
index d5f9a97..4a16120 100644
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,7 @@
-QA_DOCKER_IMAGE=jakzal/phpqa:1.92.1-php8.2-alpine
-QA_DOCKER_COMMAND=docker run --init -t --rm --user "$(shell id -u):$(shell id -g)" --volume /tmp/tmp-phpqa-$(shell id -u):/tmp --volume "$(shell pwd):/project" --workdir /project ${QA_DOCKER_IMAGE}
+include vendor/rollerscapes/standards/Makefile
 
-dist: install cs-full phpstan test-full
-lint: install cs-full phpstan
+QA_DOCKER_IMAGE=jakzal/phpqa:1.115.0-php8.4-alpine
 
-install:
-	composer install --no-progress --no-interaction --no-suggest --optimize-autoloader --prefer-dist --ansi
+phpunit:
+	./vendor/bin/phpunit
 
-test:
-	vendor/bin/phpunit
-
-# Linting tools
-phpstan: ensure
-	vendor/bin/phpstan analyse
-
-cs: ensure
-	sh -c "${QA_DOCKER_COMMAND} php-cs-fixer fix -vvv --diff"
-
-cs-full: ensure
-	sh -c "${QA_DOCKER_COMMAND} php-cs-fixer fix -vvv --using-cache=no --diff"
-
-cs-full-check: ensure
-	sh -c "${QA_DOCKER_COMMAND} php-cs-fixer fix -vvv --using-cache=no --diff --dry-run"
-
-ensure:
-	mkdir -p ${HOME}/.composer /tmp/tmp-phpqa-$(shell id -u)
-
-.PHONY: install test phpstan cs cs-full cs-full-check