diff --git a/.gitlab/issue_templates/New build-block.md b/.gitlab/issue_templates/New build-block.md
index 8eda52d..b9bc824 100644
--- a/.gitlab/issue_templates/New build-block.md	
+++ b/.gitlab/issue_templates/New build-block.md	
@@ -1,16 +1,20 @@
-# New module request
+# New build-block
 
-| **Name** | **Version** | **Group** | **Overlay** |
-|----------|-------------|-----------|-------------|
-|          |             |           |             |
+[//]: # (open an issue for each version and System)
+
+| **Name** | **Version** | **Group** | **with**   | **System** | **Overlay** |
+|----------|-------------|-----------|------------|------------|-------------|
+|          |             |           |            |            | default     |  
 
 
-## Operating systems 
+[//]: # (if you do not have hierarchival dependencies use the check-list below
+- [ ] build
+- [ ] tested
+- [ ] released
 
-[//]: # (remove lines you do not need/add missing)
+[//]: # (otherwise use check-lists like the one below for each variant)
+- [ ] version X.Y.Z with WITH1
+   - [ ] build
+   - [ ] tested
+   - [ ] released
 
-- [ ] default (`variants`)
-- [ ] RHEL6/SL6 (`variants.Linux` or `variants.rhel6`)
-- [ ] RHEL8 (`variants.rhel8`)
-- [ ] macOS 10.9 (`variants.Darwin`)
-- [ ] macOS 10.14 (Mojave, `variants.macos10.14`)
diff --git a/.gitlab/issue_templates/New variant.md b/.gitlab/issue_templates/New variant.md
index 019a4f2..1c048f7 100644
--- a/.gitlab/issue_templates/New variant.md	
+++ b/.gitlab/issue_templates/New variant.md	
@@ -1,16 +1,21 @@
 # New module variant
 
-| **Name** | **Version** | **Notes** |
-|----------|-------------|-----------|
-|          |             |           |
+[//]: # (open an issue for each version and System)
 
 
-## Operating systems 
+| **Name** | **Version** | **Group** | **with**   | **System** | **Overlay** |
+|----------|-------------|-----------|------------|------------|-------------|
+|          |             |           |            |            | default     |  
 
-[//]: # (remove lines you do not need/add missing)
 
-- [ ] default (`variants`)
-- [ ] RHEL6/SL6 (`variants.Linux` or `variants.rhel6`)
-- [ ] RHEL8 (`variants.rhel8`)
-- [ ] macOS 10.9 (`variants.Darwin`)
-- [ ] macOS 10.14 (Mojave, `variants.macos10.14`)
+[//]: # (if you do not have hierarchival dependencies use the check-list below
+- [ ] build
+- [ ] tested
+- [ ] released
+
+[//]: # (otherwise use check-lists like the one below for each variant)
+- [ ] version X.Y.Z with WITH1
+   - [ ] build
+   - [ ] tested
+   - [ ] released
+
diff --git a/Compiler/OpenBLAS/files/variants b/Compiler/OpenBLAS/files/variants.rhel6
similarity index 100%
rename from Compiler/OpenBLAS/files/variants
rename to Compiler/OpenBLAS/files/variants.rhel6
diff --git a/Compiler/gtest/1/variants b/Compiler/gtest/files/variants.rhel6
similarity index 100%
rename from Compiler/gtest/1/variants
rename to Compiler/gtest/files/variants.rhel6
diff --git a/MPI/dks/1/variants.Darwin b/MPI/dks/files/variants.Darwin
similarity index 100%
rename from MPI/dks/1/variants.Darwin
rename to MPI/dks/files/variants.Darwin
diff --git a/MPI/dks/1/variants b/MPI/dks/files/variants.rhel6
similarity index 100%
rename from MPI/dks/1/variants
rename to MPI/dks/files/variants.rhel6