diff --git a/modules/common/services/dendrite-pinecone.nix b/modules/common/services/dendrite-pinecone.nix
index 4962477b9..cc10ae78a 100644
--- a/modules/common/services/dendrite-pinecone.nix
+++ b/modules/common/services/dendrite-pinecone.nix
@@ -106,6 +106,9 @@ in
           Type = "simple";
           ExecStart = "${pkgs.smcroute}/sbin/smcrouted -n -s -f /etc/smcroute.conf";
           #TODO sudo setcap cap_net_admin=ep ${pkgs.smcroute}/sbin/smcroute
+          # TODO: Add proper AmbientCapabilities= or CapabilityBoundingSet=,
+          #       preferably former and then change user to something else than
+          #       root.
           User = "root";
           # Automatically restart service when it exits.
           Restart = "always";
@@ -126,6 +129,9 @@ in
         # Allow loopback traffic
         iptables -A INPUT -i lo -j ACCEPT
 
+        # TODO: Move all these TcpPort and things like that, to the options of
+        #       this module, away from from package itself.
+
         # Forward incoming TCP traffic on port ${dendrite-pineconePkg.TcpPort} to internal network(element-vm)
         iptables -t nat -A PREROUTING -i ${cfg.externalNic} -p tcp --dport ${dendrite-pineconePkg.TcpPort} -j DNAT --to-destination  ${cfg.serverIpAddr}:${dendrite-pineconePkg.TcpPort}
 
diff --git a/packages/dendrite-pinecone/default.nix b/packages/dendrite-pinecone/default.nix
index d246308a0..4f69efcec 100644
--- a/packages/dendrite-pinecone/default.nix
+++ b/packages/dendrite-pinecone/default.nix
@@ -9,11 +9,13 @@ buildGoModule rec {
   pname = "dendrite-pinecone";
   version = "0.9.1";
 
+  # TODO: Move all these to the options module.
   TcpPort = "49000";
   McastUdpPort = "60606";
   McastUdpIp = "239.0.0.114";
   TcpPortInt = 49000;
   McastUdpPortInt = 60606;
+
   src = fetchFromGitHub {
     owner = "tiiuae";
     repo = "dendrite";