diff --git a/kubenix-modules/cyberchef.nix b/kubenix-modules/cyberchef.nix
index 19c2578..94301c8 100644
--- a/kubenix-modules/cyberchef.nix
+++ b/kubenix-modules/cyberchef.nix
@@ -1,6 +1,6 @@
 {
   kubernetes.resources = {
-    deployments.cyberchef.spec = {
+    deployments.server.spec = {
       replicas = 3;
       selector.matchLabels.app = "cyberchef";
 
@@ -14,7 +14,7 @@
       };
     };
 
-    services.cyberchef.spec = {
+    services.server.spec = {
       selector.app = "cyberchef";
 
       ports.web = {
@@ -24,11 +24,11 @@
     };
   };
 
-  lab.ingresses.cyberchef = {
+  lab.ingresses.server = {
     host = "cyberchef.kun.is";
 
     service = {
-      name = "cyberchef";
+      name = "server";
       portName = "web";
     };
   };
diff --git a/kubenix-modules/freshrss.nix b/kubenix-modules/freshrss.nix
index 200b46c..c186cf5 100644
--- a/kubenix-modules/freshrss.nix
+++ b/kubenix-modules/freshrss.nix
@@ -2,65 +2,61 @@
   kubernetes.resources = {
     secrets.server.stringData.adminPassword = "ref+sops://secrets/kubernetes.yaml#/freshrss/password";
 
-    deployments.server = {
-      metadata.labels.app = "freshrss";
+    deployments.server.spec = {
+      selector.matchLabels.app = "freshrss";
 
-      spec = {
-        selector.matchLabels.app = "freshrss";
+      strategy = {
+        type = "RollingUpdate";
 
-        strategy = {
-          type = "RollingUpdate";
-
-          rollingUpdate = {
-            maxSurge = 0;
-            maxUnavailable = 1;
-          };
+        rollingUpdate = {
+          maxSurge = 0;
+          maxUnavailable = 1;
         };
+      };
 
-        template = {
-          metadata.labels.app = "freshrss";
+      template = {
+        metadata.labels.app = "freshrss";
 
-          spec = {
-            containers.freshrss = {
-              image = "freshrss/freshrss:1.24.1";
-              imagePullPolicy = "Always";
-              ports.web.containerPort = 80;
+        spec = {
+          containers.freshrss = {
+            image = "freshrss/freshrss:1.24.1";
+            imagePullPolicy = "Always";
+            ports.web.containerPort = 80;
 
-              env = {
-                TZ.value = "Europe/Amsterdam";
-                CRON_MIN.value = "2,32";
-                ADMIN_EMAIL.value = "pim@kunis.nl";
-                PUBLISHED_PORT.value = "443";
+            env = {
+              TZ.value = "Europe/Amsterdam";
+              CRON_MIN.value = "2,32";
+              ADMIN_EMAIL.value = "pim@kunis.nl";
+              PUBLISHED_PORT.value = "443";
 
-                ADMIN_PASSWORD.valueFrom.secretKeyRef = {
-                  name = "server";
-                  key = "adminPassword";
-                };
-
-                ADMIN_API_PASSWORD.valueFrom.secretKeyRef = {
-                  name = "server";
-                  key = "adminPassword";
-                };
+              ADMIN_PASSWORD.valueFrom.secretKeyRef = {
+                name = "server";
+                key = "adminPassword";
               };
 
-              volumeMounts = [{
-                name = "data";
-                mountPath = "/var/www/FreshRSS/data";
-              }];
+              ADMIN_API_PASSWORD.valueFrom.secretKeyRef = {
+                name = "server";
+                key = "adminPassword";
+              };
             };
 
-            volumes.data.persistentVolumeClaim.claimName = "data";
+            volumeMounts = [{
+              name = "data";
+              mountPath = "/var/www/FreshRSS/data";
+            }];
+          };
 
-            securityContext = {
-              fsGroup = 33;
-              fsGroupChangePolicy = "OnRootMismatch";
-            };
+          volumes.data.persistentVolumeClaim.claimName = "data";
+
+          securityContext = {
+            fsGroup = 33;
+            fsGroupChangePolicy = "OnRootMismatch";
           };
         };
       };
     };
 
-    services.web.spec = {
+    services.server.spec = {
       selector.app = "freshrss";
 
       ports.web = {