diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..4b50501
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/comment.md b/.github/ISSUE_TEMPLATE/comment.md
new file mode 100644
index 0000000..cf0969e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/comment.md
@@ -0,0 +1,10 @@
+---
+name: Comment
+about: Describe anything that doesn't fit to the other templates
+title: ''
+labels: comment / enhancement
+assignees: ''
+
+---
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..cdd6120
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: comment / enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000..c6078f1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,10 @@
+---
+name: Question
+about: If you have a question you can ask it here
+title: ''
+labels: question
+assignees: ''
+
+---
+
+
diff --git a/.github/workflows/compose-ci.yml b/.github/workflows/tests.yml
similarity index 97%
rename from .github/workflows/compose-ci.yml
rename to .github/workflows/tests.yml
index 44a30ea..469a5a2 100644
--- a/.github/workflows/compose-ci.yml
+++ b/.github/workflows/tests.yml
@@ -1,4 +1,4 @@
-name: docker compose tests
+name: tests
 
 on:
   # push:
diff --git a/README.md b/README.md
index f5ae402..7f1ab02 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # EVOKS repository
+![tests](https://github.com/kit-data-manager/EVOKS/actions/workflows/tests.yml/badge.svg)
 [![codecov](https://codecov.io/gh/kit-data-manager/EVOKS/graph/badge.svg?token=qXx2sFQPxW)](https://codecov.io/gh/kit-data-manager/EVOKS)
+[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 EVOKS (Editor for Vocabularies to Know Semantics) is a software for creating and publishing SKOS vocabularies and thesauri. 
 It allows you to:
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index d09183f..d6a5eb2 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   postgres:
-    container_name: evokstest_${INSTANCE_NAME:-defaultinstance}_postgres
+    container_name: evokstest_postgres
     image: postgres
     environment:
       POSTGRES_USER: ${POSTGRES_USER:-postgres}
@@ -19,7 +19,7 @@ services:
       timeout: 3s
       retries: 5
   web:
-    container_name: evokstest_${INSTANCE_NAME:-defaultinstance}_testrunner
+    container_name: evokstest_testrunner
     build:
       context: "."
     # caution, don't change this port since it is the one used within the container
@@ -44,7 +44,7 @@ services:
       - ./skosmos-dev/config.ttl:/code/skosmos-dev/config.ttl
       - ./skosmos-live/config.ttl:/code/skosmos-live/config.ttl
   fuseki-dev:
-    container_name: evokstest_${INSTANCE_NAME:-defaultinstance}_fuseki-dev
+    container_name: evokstest_fuseki-dev
     image: secoresearch/fuseki
     hostname: fuseki-dev
     environment: 
@@ -57,7 +57,7 @@ services:
     networks:
       - fuseki-dev
   fuseki-live:
-    container_name: evokstest_${INSTANCE_NAME:-defaultinstance}_fuseki-live
+    container_name: evokstest_fuseki-live
     image: secoresearch/fuseki
     hostname: fuseki-live
     environment: 
@@ -70,7 +70,7 @@ services:
     networks:
       - fuseki-live
   skosmos-dev:
-    container_name: evokstest_${INSTANCE_NAME:-defaultinstance}_skosmos-dev
+    container_name: evokstest_skosmos-dev
     build:
       context: https://github.com/NatLibFi/Skosmos.git#v2.17
       dockerfile: dockerfiles/Dockerfile.ubuntu
@@ -84,7 +84,7 @@ services:
     volumes:
       - ./skosmos-dev/config.ttl:/var/www/html/config.ttl
   skosmos-live:
-    container_name: evokstest_${INSTANCE_NAME:-defaultinstance}_skosmos-live
+    container_name: evokstest_skosmos-live
     build:
       context: https://github.com/NatLibFi/Skosmos.git#v2.17
       dockerfile: dockerfiles/Dockerfile.ubuntu