diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix
index 6390b79..9b64594 100644
--- a/applications/skynet.ie.nix
+++ b/applications/skynet.ie.nix
@@ -11,8 +11,6 @@ in {
   imports = [
     ./acme.nix
     ./dns.nix
-    ./open_governance/open_governance.nix
-    ./open_governance/keyserver.nix
   ];
 
   options.services.skynet = {
@@ -64,10 +62,6 @@ in {
       }
     ];
 
-    services.skynet.open-governance.host = cfg.host;
-    services.skynet.keyserver.host = cfg.host;
-
-    networking.firewall.allowedTCPPorts = [80 443];
     services.nginx = {
       enable = true;
       group = "acme";
diff --git a/flake.nix b/flake.nix
index 714096b..173639a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -165,7 +165,7 @@
       # trainee server
       marvin = import ./machines/marvin.nix;
 
-      # nix cache server
+      # Public Services
       calculon = import ./machines/calculon.nix;
     };
   };
diff --git a/machines/calculon.nix b/machines/calculon.nix
index 87b7a60..0557968 100644
--- a/machines/calculon.nix
+++ b/machines/calculon.nix
@@ -1,11 +1,11 @@
 /*
 
-Name:
-Why:      Speed everything up
+Name:     https://futurama.fandom.com/wiki/Calculon
+Why:      Public Service server
 Type:     VM
 Hardware: -
 From:     2024
-Role:     Nix Cache
+Role:     Public services such as Nix Cache, Open governance stuff.
 Notes:
 */
 {
@@ -18,9 +18,16 @@ Notes:
   name = "calculon";
   ip_pub = "193.1.99.82";
   hostname = "${name}.skynet.ie";
+
+  host = {
+    ip = ip_pub;
+    name = name;
+  };
 in {
   imports = [
     ../applications/nix_cache/nix_cache.nix
+    ../applications/open_governance/open_governance.nix
+    ../applications/open_governance/keyserver.nix
   ];
 
   deployment = {
@@ -46,8 +53,9 @@ in {
     }
   ];
 
-  services.skynet.nix-cache.host = {
-    ip = ip_pub;
-    name = name;
+  services.skynet = {
+    nix-cache.host = host;
+    open-governance.host = host;
+    keyserver.host = host;
   };
 }