diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0017eccde8385b9b57149e8dad7ba5f989664384..6016f1d950daad3780d5910cbbca0739f84a15f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,15 +10,41 @@ stages:
   - build
   - deploy
 
-build:
+# FIXME: Remove duplicate jobs once
+# https://gitlab.com/gitlab-org/gitlab/-/issues/35742 is resolved.
+
+build-ns4:
+  extends: .compose-build
+  tags: [ns4.shore.co.il]
+  only:
+    - ns4
+
+run-ns4:
+  extends: .compose-run
+  tags: [ns4.shore.co.il]
+  only:
+    - ns4
+
+build-host01:
   extends: .compose-build
-  tags: ["${CI_COMMIT_BRANCH}.shore.co.il"]
-  except:
-    - master
+  tags: [host01.shore.co.il]
+  only:
+    - host01
+
+run-host01:
+  extends: .compose-run
+  tags: [host01.shore.co.il]
+  only:
+    - host01
 
+build-kodi:
+  extends: .compose-build
+  tags: [kodi.shore.co.il]
+  only:
+    - kodi
 
-run:
+run-kodi:
   extends: .compose-run
-  tags: ["${CI_COMMIT_BRANCH}.shore.co.il"]
-  except:
-    - master
+  tags: [kodi.shore.co.il]
+  only:
+    - kodi