diff --git a/docker_config_files/client/grr.client.yaml b/docker_config_files/client/grr.client.yaml
index 305836b69..0bf8e128d 100644
--- a/docker_config_files/client/grr.client.yaml
+++ b/docker_config_files/client/grr.client.yaml
@@ -1,5 +1,4 @@
 Client.fleetspeak_enabled: true
-ClientBuilder.fleetspeak_bundled: true
 Client.server_urls:
 - fleetspeak-frontend
 Client.foreman_check_frequency: 10  # seconds
@@ -12,10 +11,3 @@ Logging.path: /tmp/grr-client
 Logging.filename: /tmp/grr-client/grr-client.log
 
 Client.executable_signing_public_key: "%(/configs/public-key.pem|file)"
-
-Target:Linux:
-  ClientBuilder.fleetspeak_client_config: /configs/client/client.config
-Target:Windows:
-  ClientBuilder.fleetspeak_client_config: /configs/client/client.config
-Target:Darwin:
-  ClientBuilder.fleetspeak_client_config: /configs/client/client.config
diff --git a/docker_config_files/server/grr.server.yaml b/docker_config_files/server/grr.server.yaml
index db915d344..f55da31fc 100644
--- a/docker_config_files/server/grr.server.yaml
+++ b/docker_config_files/server/grr.server.yaml
@@ -26,12 +26,10 @@ Client.executable_signing_public_key: "%(/configs/public-key.pem|file)"
 PrivateKeys.executable_signing_private_key: "%(/configs/private-key.pem|file)"
 
 # Configuration for repacking client templates:
-Client.fleetspeak_enabled: true
 ClientBuilder.fleetspeak_bundled: true
 ClientBuilder.template_dir: /client_templates
 ClientBuilder.executables_dir: /client_installers
 
-
 Target:Linux:
   ClientBuilder.fleetspeak_client_config: /configs/client/client.config
 Target:Windows: