diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc6fb7fc..e1d097e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -208,6 +208,19 @@ IOB-WIN:build:
   script:  
     - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m'
 
+IOB-WIN-MTC:build:
+  stage: build
+  tags:
+    - win
+  variables:
+    APP_NAME: IOB-WIN-MTC
+  before_script:
+    - *nuget-fix
+    - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
+    - *version-fix
+  script:  
+    - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m'
+
 IOB-WIN-NEXT:build:
   stage: build
   tags:
@@ -221,12 +234,12 @@ IOB-WIN-NEXT:build:
   script:  
     - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m'
 
-IOB-WIN-MTC:build:
+IOB-WIN-OPC-UA:build:
   stage: build
   tags:
     - win
   variables:
-    APP_NAME: IOB-WIN-MTC
+    APP_NAME: IOB-WIN-OPC-UA
   before_script:
     - *nuget-fix
     - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
@@ -288,6 +301,31 @@ IOB-WIN:release:
     - *nexusUpload
     - *SendToVersionsLog
 
+IOB-WIN-MTC:release:
+  stage: release
+  needs: ["IOB-WIN-MTC:build"]
+  tags:
+    - win
+  variables:
+    APP_NAME: IOB-WIN-MTC
+    NEXUS_PATH: MAPO/IOB-WIN-MTC
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'master'
+      changes: 
+        - IOB-WIN-MTC/*
+      when: always
+  before_script:
+    - *nuget-fix
+    - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
+    - *version-fix
+    - *cleanup-zip
+  script:  
+    - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m'
+    - *zipper
+    - *hashBuild
+    - *nexusUpload
+    - *SendToVersionsLog
+
 IOB-WIN-NEXT:release:
   stage: release
   needs: ["IOB-WIN-NEXT:build"]
@@ -313,18 +351,18 @@ IOB-WIN-NEXT:release:
     - *nexusUpload
     - *SendToVersionsLog
 
-IOB-WIN-PING:release:
+IOB-WIN-OPC-UA:release:
   stage: release
-  needs: ["IOB-WIN-PING:build"]
+  needs: ["IOB-WIN-OPC-UA:build"]
   tags:
     - win
   variables:
-    APP_NAME: IOB-WIN-PING
-    NEXUS_PATH: MAPO/IOB-WIN-PING
+    APP_NAME: IOB-WIN-OPC-UA
+    NEXUS_PATH: MAPO/IOB-WIN-OPC-UA
   rules:
     - if: $CI_COMMIT_BRANCH == 'master'
       changes: 
-        - IOB-WIN-PING/*
+        - IOB-WIN-OPC-UA/*
       when: always
   before_script:
     - *nuget-fix
@@ -338,18 +376,18 @@ IOB-WIN-PING:release:
     - *nexusUpload
     - *SendToVersionsLog
 
-IOB-WIN-MTC:release:
+IOB-WIN-PING:release:
   stage: release
-  needs: ["IOB-WIN-MTC:build"]
+  needs: ["IOB-WIN-PING:build"]
   tags:
     - win
   variables:
-    APP_NAME: IOB-WIN-MTC
-    NEXUS_PATH: MAPO/IOB-WIN-MTC
+    APP_NAME: IOB-WIN-PING
+    NEXUS_PATH: MAPO/IOB-WIN-PING
   rules:
     - if: $CI_COMMIT_BRANCH == 'master'
       changes: 
-        - IOB-WIN-MTC/*
+        - IOB-WIN-PING/*
       when: always
   before_script:
     - *nuget-fix
@@ -391,6 +429,27 @@ IOB-WIN-WPS:release:
 # --------------------------------
 # DocFx
 # --------------------------------
+
+IOB-WIN-MTC:docfx:
+  stage: docfx
+  needs: ["IOB-WIN-MTC:build"]
+  tags:
+    - win
+  variables:
+    APP_NAME: IOB-WIN-MTC
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'master'
+      changes: 
+        - IOB-WIN-MTC/*
+      when: always
+  before_script:
+    - *nuget-fix
+    - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
+  script:
+    - docfx $env:APP_NAME/docfx.json
+    - mv $env:APP_NAME/_site "docfx"
+    - *DocReplica
+
 IOB-WIN-NEXT:docfx:
   stage: docfx
   needs: ["IOB-WIN-NEXT:build"]
@@ -411,6 +470,26 @@ IOB-WIN-NEXT:docfx:
     - mv $env:APP_NAME/_site "docfx"
     - *DocReplica
 
+IOB-WIN-OPC-UA:docfx:
+  stage: docfx
+  needs: ["IOB-WIN-OPC-UA:build"]
+  tags:
+    - win
+  variables:
+    APP_NAME: IOB-WIN-OPC-UA
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'master'
+      changes: 
+        - IOB-WIN-OPC-UA/*
+      when: always
+  before_script:
+    - *nuget-fix
+    - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
+  script:
+    - docfx $env:APP_NAME/docfx.json
+    - mv $env:APP_NAME/_site "docfx"
+    - *DocReplica
+
 IOB-WIN-PING:docfx:
   stage: docfx
   needs: ["IOB-WIN-PING:build"]
@@ -431,26 +510,6 @@ IOB-WIN-PING:docfx:
     - mv $env:APP_NAME/_site "docfx"
     - *DocReplica
 
-IOB-WIN-MTC:docfx:
-  stage: docfx
-  needs: ["IOB-WIN-MTC:build"]
-  tags:
-    - win
-  variables:
-    APP_NAME: IOB-WIN-MTC
-  rules:
-    - if: $CI_COMMIT_BRANCH == 'master'
-      changes: 
-        - IOB-WIN-MTC/*
-      when: always
-  before_script:
-    - *nuget-fix
-    - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
-  script:
-    - docfx $env:APP_NAME/docfx.json
-    - mv $env:APP_NAME/_site "docfx"
-    - *DocReplica
-
 IOB-WIN-WPS:docfx:
   stage: docfx
   needs: ["IOB-WIN-WPS:build"]