diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cafe6598a56e7b3840e2f53186bdc940179ff801..6f130637fc3b215aa92364ed70bf594fee2f74d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,8 @@
 include:
   - project: shore/ci-templates
     file: templates/pre-commit.yml
+  - project: shore/ci-templates
+    file: templates/notify.yml
 
 stages:
   - test
@@ -14,6 +16,7 @@ stages:
 # hard-coded to latest.
 variables:
   TAG: latest
+  CONTEXT: "$IMAGE"
 
 # Job templates:
 
@@ -23,7 +26,7 @@ variables:
     DOCKER_BUILDKIT: "1"
   tags: &tags [ns4.shore.co.il]
   script:
-    - docker build --pull --no-cache --iidfile iid "$IMAGE"
+    - docker build --pull --no-cache --iidfile iid "$CONTEXT"
   after_script:
     - echo "HASH=$(cat iid)" > dot.env
   artifacts:
@@ -33,8 +36,8 @@ variables:
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_PIPELINE_SOURCE == "push"
       changes:
-        - $IMAGE/*
-        - $IMAGE/**/*
+        - $CONTEXT/*
+        - $CONTEXT/**/*
 
 .push:
   stage: deploy
@@ -49,7 +52,7 @@ variables:
 build-cgit:
   extends: .build
   variables:
-    IMAGE: cgit
+    CONTEXT: cgit
 
 push-cgit:
   extends: .push
@@ -64,7 +67,7 @@ push-cgit:
 build-httpd:
   extends: .build
   variables:
-    IMAGE: httpd
+    CONTEXT: httpd
 
 push-httpd:
   extends: .push