diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42d8866..ab6f41d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,18 +7,17 @@ before_script:
 - dotnet restore
 - dotnet nuget remove source gitlab || true
 nonreg:
+  tags:
+    - dotnet
   stage: test
   script:
   - |
     echo "$CI_JOB_STAGE"
     cd test/isnd.tests/
     ASPNETCORE_ENVIRONMENT=Development dotnet test
-test2:
-  stage: test
-  script:
-  - echo "Do another parallel test here"
-  - echo "For example run a lint test"
 publish:
+  tags:
+    - dotnet
   stage: deploy
   artifacts:
     paths:
@@ -27,9 +26,9 @@ publish:
   script:
   - dotnet publish --configuration Release
 deploy-to-gitlab:
-  stage: deploy
   tags:
-    - msbuild
+    - dotnet
+  stage: deploy
   artifacts:
     paths:
     - src/*/bin/Release/*.nupkg