diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d29c6611..51b0fcf2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,8 +91,6 @@ LAND:build:
     APP_NAME: MP.Land
     SOL_NAME: MP-LAND
   rules:
-    # - if: $CI_COMMIT_BRANCH =~ /^feature/
-    #   when: never
     - if: $CI_COMMIT_BRANCH == 'develop'
     - if: $CI_COMMIT_BRANCH == 'master'
     - if: $CI_COMMIT_BRANCH =~ /^feature\/LAND.+/
@@ -112,11 +110,10 @@ PROG:build:
     APP_NAME: MP.Prog
     SOL_NAME: MP-PROG
   rules:
-    - if: $CI_COMMIT_BRANCH =~ "feature/"
-      when: never
-    - if: $CI_COMMIT_BRANCH == "develop"
-    - if: $CI_COMMIT_BRANCH == "master"
-    - if: $CI_COMMIT_BRANCH =~ "feature/PROG.+"
+    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH == 'master'
+    - if: $CI_COMMIT_BRANCH =~ /^feature\/PROG.+/
+      when: always
   before_script:
     - *nuget-fix
     - dotnet restore "$env:SOL_NAME.sln"
@@ -131,9 +128,10 @@ STAT:build:
     APP_NAME: MP.Stats
     SOL_NAME: MP-STATS
   rules:
-    - if: $CI_COMMIT_BRANCH == "develop"
-    - if: $CI_COMMIT_BRANCH == "master"
-    # - if: $CI_COMMIT_BRANCH =~ /^feature/STAT*
+    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH == 'master'
+    - if: $CI_COMMIT_BRANCH =~ /^feature\/STAT.+/
+      when: always
   before_script:
     - *nuget-fix
     - dotnet restore "$env:SOL_NAME.sln"
@@ -148,9 +146,10 @@ MON:build:
     APP_NAME: MP.Mon
     SOL_NAME: MP-MON
   rules:
-    - if: $CI_COMMIT_BRANCH == "develop"
-    - if: $CI_COMMIT_BRANCH == "master"
-    # - if: $CI_COMMIT_BRANCH =~ /^feature/MON*
+    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH == 'master'
+    - if: $CI_COMMIT_BRANCH =~ /^feature\/MON.+/
+      when: always
   before_script:
     - *nuget-fix
     - dotnet restore "$env:SOL_NAME.sln"
@@ -165,9 +164,10 @@ SPEC:build:
     APP_NAME: MP.SPEC
     SOL_NAME: MP-SPEC
   rules:
-    - if: $CI_COMMIT_BRANCH == "develop"
-    - if: $CI_COMMIT_BRANCH == "master"
-    # - if: $CI_COMMIT_BRANCH =~ /^feature/SPEC*
+    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH == 'master'
+    - if: $CI_COMMIT_BRANCH =~ /^feature\/SPEC.+/
+      when: always
   before_script:
     - *nuget-fix
     - dotnet restore "$env:SOL_NAME.sln"
@@ -182,9 +182,10 @@ INVE:build:
     APP_NAME: MP.INVE
     SOL_NAME: MP-INVE
   rules:
-    - if: $CI_COMMIT_BRANCH == "develop"
-    - if: $CI_COMMIT_BRANCH == "master"
-    # - if: $CI_COMMIT_BRANCH =~ /^feature/INVE*
+    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH == 'master'
+    - if: $CI_COMMIT_BRANCH =~ /^feature\/INVE.+/
+      when: always
   before_script:
     - *nuget-fix
     - dotnet restore "$env:SOL_NAME.sln"
@@ -199,9 +200,10 @@ CONF:build:
     APP_NAME: IobConf.UI
     SOL_NAME: IobConf
   rules:
-    - if: $CI_COMMIT_BRANCH == "develop"
-    - if: $CI_COMMIT_BRANCH == "master"
-    # - if: $CI_COMMIT_BRANCH =~ /^feature/CONF*
+    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH == 'master'
+    - if: $CI_COMMIT_BRANCH =~ /^feature\/CONF.+/
+      when: always
   before_script:
     - *nuget-fix
     - dotnet restore "$env:SOL_NAME.sln"
@@ -216,9 +218,10 @@ IOC:build:
     APP_NAME: MP.IOC
     SOL_NAME: MP-IOC
   rules:
-    - if: $CI_COMMIT_BRANCH == "develop"
-    - if: $CI_COMMIT_BRANCH == "master"
-    # - if: $CI_COMMIT_BRANCH =~ /^feature/IOC*
+    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH == 'master'
+    - if: $CI_COMMIT_BRANCH =~ /^feature\/IOC.+/
+      when: always
   before_script:
     - *nuget-fix
     - dotnet restore "$env:SOL_NAME.sln"
@@ -233,9 +236,10 @@ TAB3:build:
     APP_NAME: MP-TAB-SERV
     SOL_NAME: MP-TAB3
   rules:
-    - if: $CI_COMMIT_BRANCH == "develop"
-    - if: $CI_COMMIT_BRANCH == "master"
-    # - if: $CI_COMMIT_BRANCH =~ /^feature/TAB*
+    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH == 'master'
+    - if: $CI_COMMIT_BRANCH =~ /^feature\/TAB.+/
+      when: always
   before_script:
     - *nuget-fix
     - dotnet restore "$env:SOL_NAME.sln"
@@ -254,12 +258,11 @@ LAND:IIS01:deploy:
   before_script:
     - *nuget-fix
     - dotnet restore "$env:SOL_NAME.sln"
-  # only:
-  #   - develop
-  #   - feature/LAND.+
   rules:
-    - if: $CI_COMMIT_BRANCH == "develop"
-    - if: $CI_COMMIT_BRANCH =~ "/^feature/LAND.+"
+    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH == 'master'
+    - if: $CI_COMMIT_BRANCH =~ /^feature\/LAND.+/
+      when: always
 
   needs: ["LAND:build"]
   script: