diff --git a/ci/ci-pr.nix b/ci/ci-pr.nix
index 814f0628d9..dd26630253 100644
--- a/ci/ci-pr.nix
+++ b/ci/ci-pr.nix
@@ -1,4 +1,3 @@
 # This file is used to govern CI jobs for GitHub PRs
-
-args@{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ], src ? null, ... }:
-import ./ci.nix (args // { inherit supportedSystems src; isMaster = false; })
+args@{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ], src ? builtins.fetchGit ../., ... }:
+import ./ci.nix (args // { inherit supportedSystems src; })
diff --git a/ci/ci.nix b/ci/ci.nix
index 3d9cad561a..a90aa938b1 100644
--- a/ci/ci.nix
+++ b/ci/ci.nix
@@ -6,15 +6,12 @@
   # The version of the release. Will be set to the right value in ./release.nix.
 , releaseVersion ? "latest"
 
-  # TODO: Remove isMaster once switched to new CD system (https://dfinity.atlassian.net/browse/INF-1149)
-, isMaster ? true
-
-, pkgs ? import ../nix { inherit system isMaster RustSec-advisory-db; }
+, pkgs ? import ../nix { inherit system RustSec-advisory-db; }
 }:
 pkgs.lib.mk-jobset {
   inherit supportedSystems;
   inherit (src) rev;
   mkJobsetSpec = { system, pkgs, jobset }: import ../. {
-    inherit system pkgs jobset RustSec-advisory-db releaseVersion isMaster src;
+    inherit system pkgs jobset RustSec-advisory-db releaseVersion src;
   };
 }
diff --git a/default.nix b/default.nix
index fd5d68db6b..492eb0f0f5 100644
--- a/default.nix
+++ b/default.nix
@@ -1,11 +1,9 @@
 { system ? builtins.currentSystem
 , src ? null
 , releaseVersion ? "latest"
-  # TODO: Remove isMaster once switched to new CD system (https://dfinity.atlassian.net/browse/INF-1149)
-, isMaster ? false
 , RustSec-advisory-db ? null
 , pkgs ? import ./nix { inherit system RustSec-advisory-db; }
-, jobset ? import ./ci/ci.nix { inherit system releaseVersion RustSec-advisory-db pkgs isMaster src; }
+, jobset ? import ./ci/ci.nix { inherit system releaseVersion RustSec-advisory-db pkgs src; }
 }:
 rec {
   dfx = import ./dfx.nix { inherit pkgs userlib-js; };
@@ -19,7 +17,7 @@ rec {
 
   inherit (pkgs) nix-fmt nix-fmt-check;
 
-  public = import ./public { inherit pkgs src releaseVersion isMaster; };
+  public = import ./public { inherit pkgs src releaseVersion; };
   inherit (public) install-sh-release install-sh;
 
   # This is to make sure CI evaluates shell derivations, builds their
diff --git a/nix/default.nix b/nix/default.nix
index 01737a1765..4c3e71aade 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -1,8 +1,6 @@
 # Returns the nixpkgs set overridden and extended with DFINITY specific
 # packages.
 { system ? builtins.currentSystem
-  # TODO: Remove isMaster once switched to new CD system (https://dfinity.atlassian.net/browse/INF-1149)
-, isMaster ? false
 , RustSec-advisory-db ? null
 }:
 let
@@ -47,7 +45,7 @@ let
                 then RustSec-advisory-db
                 else self.sources.advisory-db;
 
-              motoko = import self.sources.motoko { system = self.system; };
+              motoko = import self.sources.motoko { inherit (self) system; };
               dfinity = (import self.sources.dfinity { inherit (self) system; }).dfinity.rs;
               napalm = self.callPackage self.sources.napalm {
                 pkgs = self // { nodejs = self.nodejs-12_x; };
@@ -59,7 +57,7 @@ let
               lib = super.lib // {
                 mk-jobset = import ./mk-jobset.nix self;
 
-                mkRelease = super.callPackage ./mk-release.nix { inherit isMaster; };
+                mkRelease = super.callPackage ./mk-release.nix {};
               };
 
               # An attribute set mapping every supported system to a nixpkgs evaluated for
@@ -70,7 +68,7 @@ let
                   if supportedSystem == system
                   then self
                   else import ./. {
-                    inherit isMaster RustSec-advisory-db;
+                    inherit RustSec-advisory-db;
                     system = supportedSystem;
                   }
               );
diff --git a/nix/mk-release.nix b/nix/mk-release.nix
index 9bb0eedd70..e21551250e 100644
--- a/nix/mk-release.nix
+++ b/nix/mk-release.nix
@@ -3,8 +3,6 @@
 , gzip
 , jo
 , patchelf
-  # TODO: Remove isMaster once switched to new CD system (https://dfinity.atlassian.net/browse/INF-1149)
-, isMaster ? false
 }:
 rname: version: from: what:
 stdenv.mkDerivation {
@@ -13,7 +11,6 @@ stdenv.mkDerivation {
   phases = [ "buildPhase" ];
   buildInputs = [ gzip jo patchelf ];
   allowedRequisites = [];
-  inherit isMaster;
   buildPhase = ''
     # Building the artifacts
     mkdir -p $out
diff --git a/public/default.nix b/public/default.nix
index 168a23251e..b6ef7c24ea 100644
--- a/public/default.nix
+++ b/public/default.nix
@@ -2,8 +2,6 @@
 , system ? builtins.currentSystem
 , src ? null
 , releaseVersion ? "latest"
-  # TODO: Remove isMaster once switched to new CD system (https://dfinity.atlassian.net/browse/INF-1149)
-, isMaster ? false
 }:
 
 let
@@ -45,7 +43,6 @@ rec {
     in
       pkgs.runCommandNoCC "install-sh-lint" {
         inherit version public;
-        inherit isMaster;
         buildInputs = [ install-sh pkgs.shfmt pkgs.shellcheck ];
         preferLocalBuild = true;
         allowSubstitutes = false;
@@ -86,7 +83,6 @@ rec {
     pkgs.lib.linuxOnly (
       pkgs.runCommandNoCC "install-sh-release" {
         inherit version;
-        inherit isMaster;
 
         # `revision` will be printed by `install.sh` as follows:
         #