diff --git a/Makefile b/Makefile
index 77109f9e1..e62625527 100644
--- a/Makefile
+++ b/Makefile
@@ -70,17 +70,13 @@ endif
 
 # control rln code compilation
 ifeq ($(RLN), true)
-NIM_PARAMS := $(NIM_PARAMS) -d:rln
-else  ifeq ($(CI), true)
-NIM_PARAMS := $(NIM_PARAMS) -d:rln 
+NIM_PARAMS := $(NIM_PARAMS) -d:rlnzerokit
+else ifeq ($(CI), true)
+NIM_PARAMS := $(NIM_PARAMS) -d:rlnzerokit 
 endif
 
-# control rln code compilation
-ifeq ($(RLNZEROKIT), true)
-NIM_PARAMS := $(NIM_PARAMS) -d:rlnzerokit
-#To avoid redefinition conflicts, we disable rln zerokit default compilation in CI
-#else ifeq ($(CI), true)
-#NIM_PARAMS := $(NIM_PARAMS) -d:rlnzerokit 
+ifeq ($(RLNKILIC), true)
+NIM_PARAMS := $(NIM_PARAMS) -d:rln
 endif
 
 # detecting the os
@@ -175,19 +171,20 @@ endif
 endif
 
 rlnlib:
-ifeq ($(RLN), true)
-	cargo build --manifest-path vendor/rln/Cargo.toml
-else  ifeq ($(CI), true)
+ifeq ($(RLNKILIC), true)
 	cargo build --manifest-path vendor/rln/Cargo.toml
+# Avoid compiling the non-default implementation of RLN in CI
+# else  ifeq ($(CI), true)
+# 	cargo build --manifest-path vendor/rln/Cargo.toml
 endif
 
 
 rlnzerokitlib:
-ifeq ($(RLNZEROKIT), true)
+ifeq ($(RLN), true)
+	cargo build --manifest-path vendor/zerokit/rln/Cargo.toml --release
+# Enable zerokit rln in CI
+else  ifeq ($(CI), true)
 	cargo build --manifest-path vendor/zerokit/rln/Cargo.toml --release
-#To avoid redefinition conflicts, we disable rln zerokit default compilation in CI
-#else  ifeq ($(CI), true)
-#	cargo build --manifest-path vendor/zerokit/rln/Cargo.toml --release
 endif
 
 test2: | build deps installganache
diff --git a/shell.nix b/shell.nix
index 1b76081fb..b1cb18281 100644
--- a/shell.nix
+++ b/shell.nix
@@ -11,5 +11,8 @@ pkgs.mkShell {
     git   # 2.37.3
     which # 2.21
     rustc # 1.63.0
-  ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
+  ] ++ lib.optionals stdenv.isDarwin [ 
+    libiconv
+    darwin.apple_sdk.frameworks.Security
+  ];
 }