diff --git a/lib/core/icingaagent/misc/Convert-IcingaDirectorSelfServiceArguments.psm1 b/lib/core/icingaagent/misc/Convert-IcingaDirectorSelfServiceArguments.psm1
index 156bc8d..f6cf406 100644
--- a/lib/core/icingaagent/misc/Convert-IcingaDirectorSelfServiceArguments.psm1
+++ b/lib/core/icingaagent/misc/Convert-IcingaDirectorSelfServiceArguments.psm1
@@ -15,7 +15,7 @@ function Convert-IcingaDirectorSelfServiceArguments()
         AllowVersionChanges = $JsonInput.allow_updates;
         GlobalZones         = $JsonInput.global_zones;
         ParentZone          = $JsonInput.parent_zone;
-        CAEndpoint          = $JsonInput.ca_server;
+        #CAEndpoint          = $JsonInput.ca_server;
         Endpoints           = $JsonInput.parent_endpoints;
         AddFirewallRule     = $JsonInput.agent_add_firewall_rule;
         AcceptConnections   = $JsonInput.agent_add_firewall_rule;
@@ -58,6 +58,11 @@ function Convert-IcingaDirectorSelfServiceArguments()
         $DirectorArguments.Add(
             'EndpointConnections', $NetworkDefault
         );
+
+        $EndpointConnections = $NetworkDefault.Split(',');
+        $DirectorArguments.Add(
+            'CAEndpoint', (Get-IPConfigFromString $EndpointConnections[0]).address
+        );
     }
 
     return $DirectorArguments;