diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e5d0ad..b97bfdf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ stages:
   - deploy
 
 
-build-branch:
+branch build:
   stage: build
   tags:
     - docker
@@ -37,7 +37,7 @@ build-branch:
       - artifacts/*.snupkg
     expire_in: 7 days
 
-test-branch:
+branch test:
   stage: test
   tags:
     - docker
@@ -50,16 +50,17 @@ test-branch:
     - dotnet test -c Debug --nologo --no-restore
 
 
-build-main:
+main build common:
   stage: build
   tags:
     - docker
     - lnx
     - amd64
   only:
-    - tags
-    - changes:
-      - AMWD.Common/*
+    refs:
+      - tags
+    changes:
+    - AMWD.Common/**
   script:
     - dotnet restore --no-cache --force
     - dotnet build -c Release --nologo --no-restore --no-incremental
@@ -72,16 +73,17 @@ build-main:
       - artifacts/*.snupkg
     expire_in: 1 day
 
-build-main-asp:
+main build aspnet:
   stage: build
   tags:
     - docker
     - lnx
     - amd64
   only:
-    - tags
-    - changes:
-      - AMWD.Common.AspNetCore/*
+    refs:
+      - tags
+    changes:
+    - AMWD.Common.AspNetCore/**
   script:
     - dotnet restore --no-cache --force
     - dotnet build -c Release --nologo --no-restore --no-incremental
@@ -94,16 +96,17 @@ build-main-asp:
       - artifacts/*.snupkg
     expire_in: 1 day
 
-build-main-efc:
+main build entityframework:
   stage: build
   tags:
     - docker
     - lnx
     - amd64
   only:
-    - tags
-    - changes:
-      - AMWD.Common.EntityFrameworkCore/*
+    refs:
+      - tags
+    changes:
+    - AMWD.Common.EntityFrameworkCore/**
   script:
     - dotnet restore --no-cache --force
     - dotnet build -c Release --nologo --no-restore --no-incremental
@@ -116,16 +119,17 @@ build-main-efc:
       - artifacts/*.snupkg
     expire_in: 1 day
 
-build-main-test:
+main build test:
   stage: build
   tags:
     - docker
     - lnx
     - amd64
   only:
-    - tags
-    - changes:
-      - AMWD.Common.Test/*
+    refs:
+      - tags
+    changes:
+    - AMWD.Common.AspNetCore/**
   script:
     - dotnet restore --no-cache --force
     - dotnet build -c Release --nologo --no-restore --no-incremental
@@ -138,79 +142,84 @@ build-main-test:
       - artifacts/*.snupkg
     expire_in: 1 day
 
-test-main:
+main test all:
   stage: test
   tags:
     - docker
     - lnx
     - amd64
   only:
-    - tags
+    refs:
+      - tags
   coverage: '/Total[^|]*\|[^|]*\|\s*([0-9.%]+)/'
   script:
     - dotnet restore --no-cache --force
     - dotnet test -c Release --nologo --no-restore
 
-deploy-main:
+deploy common:
   stage: deploy
   dependencies:
-    - test-main
-    - build-main
+    - main test all
+    - main build common
   tags:
     - docker
     - lnx
     - amd64
   only:
-    - tags
-    - changes:
-      - AMWD.Common/*
+    refs:
+      - tags
+    changes:
+    - AMWD.Common/**
   script:
     - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.*.nupkg
 
-deploy-main-asp:
+deploy aspnet:
   stage: deploy
   dependencies:
-    - test-main
-    - build-main-asp
+    - main test all
+    - main build aspnet
   tags:
     - docker
     - lnx
     - amd64
   only:
-    - tags
-    - changes:
-      - AMWD.Common.AspNetCore/*
+    refs:
+      - tags
+    changes:
+    - AMWD.Common.AspNetCore/**
   script:
     - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.AspNetCore.*.nupkg
 
-deploy-main-efc:
+deploy entityframework:
   stage: deploy
   dependencies:
-    - test-main
-    - build-main-efc
+    - main test all
+    - main build entityframework
   tags:
     - docker
     - lnx
     - amd64
   only:
-    - tags
-    - changes:
-      - AMWD.Common.EntityFrameworkCore/*
+    refs:
+      - tags
+    changes:
+    - AMWD.Common.EntityFrameworkCore/**
   script:
     - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.EntityFrameworkCore.*.nupkg
 
 deploy-main-test:
   stage: deploy
   dependencies:
-    - test-main
-    - build-main-test
+    - main test all
+    - main build test
   tags:
     - docker
     - lnx
     - amd64
   only:
-    - tags
-    - changes:
-      - AMWD.Common.Test/*
+    refs:
+      - tags
+    changes:
+    - AMWD.Common.Test/**
   script:
     - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.Test.*.nupkg