diff --git a/modules/grzegorz.nix b/modules/grzegorz.nix
index 9a9752d..d72399a 100644
--- a/modules/grzegorz.nix
+++ b/modules/grzegorz.nix
@@ -1,4 +1,4 @@
-{config, lib, pkgs, ...}:
+{config, lib, pkgs, values, ...}:
 let
   grg = config.services.greg-ng;
   grgw = config.services.grzegorz-webui;
@@ -37,8 +37,12 @@ in {
         "${machine}.pvv.org"
       ];
       extraConfig = ''
-        allow 129.241.210.128/25;
-        allow 2001:700:300:1900::/64;
+        # pvv
+        allow ${values.ipv4-space}
+        allow ${values.ipv6-space}
+        # ntnu
+        allow 129.241.0.0/16 # https://ipinfo.io/ips/129.241.0.0/16
+        allow 2001:700:300::/48; # https://ipinfo.io/2001:700:300::
         deny all;
       '';
     };
@@ -51,8 +55,12 @@ in {
         "${machine}-backend.pvv.org"
       ];
       extraConfig = ''
-        allow 129.241.210.128/25;
-        allow 2001:700:300:1900::/64;
+        # pvv
+        allow ${values.ipv4-space}
+        allow ${values.ipv6-space}
+        # ntnu
+        allow 129.241.0.0/16 # https://ipinfo.io/ips/129.241.0.0/16
+        allow 2001:700:300::/48; # https://ipinfo.io/2001:700:300::
         deny all;
       '';
 
@@ -70,8 +78,12 @@ in {
         "${machine}-old.pvv.org"
       ];
       extraConfig = ''
-        allow 129.241.210.128/25;
-        allow 2001:700:300:1900::/64;
+        # pvv
+        allow ${values.ipv4-space}
+        allow ${values.ipv6-space}
+        # ntnu
+        allow 129.241.0.0/16 # https://ipinfo.io/ips/129.241.0.0/16
+        allow 2001:700:300::/48; # https://ipinfo.io/2001:700:300::
         deny all;
       '';