diff --git a/morph/lib/make-issuer.nix b/morph/lib/make-issuer.nix
index b5573a15d2e5e8bf75ea370b89506b7877c4bf98..9d60db4120f4101599e6d8bee17ef32e87a6c751 100644
--- a/morph/lib/make-issuer.nix
+++ b/morph/lib/make-issuer.nix
@@ -12,9 +12,8 @@
 , ...
 }: let
 
-  enableVpn = if (monitoringvpnKeyDir != null &&
-                  monitoringvpnIPv4 != null)
-              then true else false;
+  enableVpn = monitoringvpnKeyDir != null &&
+              monitoringvpnIPv4 != null;
 
   vpnSecrets = if !enableVpn then {} else {
     "monitoringvpn-secret-key" = {
diff --git a/morph/lib/make-monitoring.nix b/morph/lib/make-monitoring.nix
index 370f177e97ba63f26e4d325a6329666907608ed9..b65f724901ea0cb07a625f0d4bca1cc5153130e0 100644
--- a/morph/lib/make-monitoring.nix
+++ b/morph/lib/make-monitoring.nix
@@ -10,10 +10,9 @@
 , vpnClientIPs ? null
 , ... }: let
 
-  enableVpn = if (monitoringvpnKeyDir != null &&
-                  monitoringvpnIPv4 != null &&
-                  vpnClientIPs != null)
-              then true else false;
+  enableVpn = monitoringvpnKeyDir != null &&
+              monitoringvpnIPv4 != null &&
+              vpnClientIPs != null;
 
   vpnSecrets = if !enableVpn then {} else {
     "monitoringvpn-private-key" = {
diff --git a/morph/lib/make-testing.nix b/morph/lib/make-testing.nix
index 023c9202f9f6a4533815d73636310d2a040b11c7..14765fdcf23946c605c2795a33e5f1afa8f6ad43 100644
--- a/morph/lib/make-testing.nix
+++ b/morph/lib/make-testing.nix
@@ -9,9 +9,8 @@
 , monitoringvpnIPv4 ? null
 , ... }: let
 
-  enableVpn = if (monitoringvpnKeyDir != null &&
-                  monitoringvpnIPv4 != null)
-              then true else false;
+  enableVpn = monitoringvpnKeyDir != null &&
+              monitoringvpnIPv4 != null;
 
   vpnSecrets = if !enableVpn then {} else {
     "monitoringvpn-secret-key" = {