diff --git a/disabled.yml b/disabled.yml
new file mode 100644
index 0000000000000000000000000000000000000000..20175df60bf77ebf6c82bb820586f72cdf60f75b
--- /dev/null
+++ b/disabled.yml
@@ -0,0 +1,5 @@
+# Dummy file only, can be overwritten by projects.
+
+.client-tasks:
+  only:
+    - master
diff --git a/lakedrops-execute.yml b/lakedrops-execute.yml
index 1a791487316fab3b85fb551a6f9af23196194c1f..f6c655ec0a3d72aadc59ed3bfe2155ae18e367c4 100644
--- a/lakedrops-execute.yml
+++ b/lakedrops-execute.yml
@@ -2,6 +2,9 @@ include:
   - project: gitlab-ci-cd/drupal
     ref: master
     file: /test-and-deploy.yml
+  - project: $LAKEDROPS_CI_PROJECT
+    ref: $LAKEDROPS_CI_REF
+    file: $LAKEDROPS_CI_FILE
   - project: gitlab-ci-cd/drupal
     ref: master
     file: /tests/lakedrops.yml
@@ -17,14 +20,6 @@ include:
         - $INITIALINSTALL == "yes"
         - $DISABLE_CI_TESTS == "1"
         - $DISABLE_GITLAB_CI_TESTS == "1"
-  - project: $LAKEDROPS_CI_PROJECT
-    ref: $LAKEDROPS_CI_REF
-    file: $LAKEDROPS_CI_FILE
-    except:
-      variables:
-        - $LAKEDROPS_CI_PROJECT == "0"
-        - $LAKEDROPS_CI_REF == "0"
-        - $LAKEDROPS_CI_FILE == "0.yml"
 
 Build Prod Site:
   extends: '.build-prod'
diff --git a/lakedrops.yml b/lakedrops.yml
index e2535411339d498941ef059c40dbfddab3c8a11d..9fc42b93d8176652fa16e2e4dcbff8fb0b241557 100644
--- a/lakedrops.yml
+++ b/lakedrops.yml
@@ -17,9 +17,9 @@ variables:
   ENVIRONMENT_NAME: ${PROJECT_NAME}/$CI_COMMIT_REF_NAME
   ENVIRONMENT_URL: https://www.example.com/$SITE_NAME
   GITLAB_DOMAIN: gitlab.lakedrops.com
-  LAKEDROPS_CI_PROJECT: 0
-  LAKEDROPS_CI_REF: 0
-  LAKEDROPS_CI_FILE: 0.yml
+  LAKEDROPS_CI_PROJECT: gitlab-ci-cd/drupal
+  LAKEDROPS_CI_REF: master
+  LAKEDROPS_CI_FILE: disabled.yml
   LAKEDROPS_DEBUG: 0
   NAMESPACES_CHECK_UPDATE: drupal/* bitegra/* lakedrops/*
   PHP_MAJOR_VERSION: 7