diff --git a/templates/etc/systemd/system/nodepool-builder.service.d/redhat.conf b/templates/etc/systemd/system/nodepool-builder.service.d/override.conf
similarity index 100%
rename from templates/etc/systemd/system/nodepool-builder.service.d/redhat.conf
rename to templates/etc/systemd/system/nodepool-builder.service.d/override.conf
diff --git a/templates/etc/systemd/system/nodepool-builder.service.d/ubuntu-xenial.conf b/templates/etc/systemd/system/nodepool-launcher.service.d/override.conf
similarity index 100%
rename from templates/etc/systemd/system/nodepool-builder.service.d/ubuntu-xenial.conf
rename to templates/etc/systemd/system/nodepool-launcher.service.d/override.conf
diff --git a/templates/etc/systemd/system/nodepool-launcher.service.d/redhat.conf b/templates/etc/systemd/system/nodepool-launcher.service.d/redhat.conf
deleted file mode 100644
index 602ac8e..0000000
--- a/templates/etc/systemd/system/nodepool-launcher.service.d/redhat.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is generated by Ansible
-#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
-#
diff --git a/templates/etc/systemd/system/nodepool-launcher.service.d/ubuntu-xenial.conf b/templates/etc/systemd/system/nodepool-launcher.service.d/ubuntu-xenial.conf
deleted file mode 100644
index 602ac8e..0000000
--- a/templates/etc/systemd/system/nodepool-launcher.service.d/ubuntu-xenial.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is generated by Ansible
-#  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
-#
diff --git a/vars/redhat.yaml b/vars/redhat.yaml
index dfca23a..c8d84ad 100644
--- a/vars/redhat.yaml
+++ b/vars/redhat.yaml
@@ -28,7 +28,7 @@ __nodepool_file_nodepool_builder_service_src: etc/systemd/system/nodepool-builde
 
 __nodepool_file_nodepool_builder_service_config_dest: /etc/systemd/system/nodepool-builder.service.d/override.conf
 __nodepool_file_nodepool_builder_service_config_mode: 0644
-__nodepool_file_nodepool_builder_service_config_src: etc/systemd/system/nodepool-builder.service.d/redhat.conf
+__nodepool_file_nodepool_builder_service_config_src: etc/systemd/system/nodepool-builder.service.d/override.conf
 
 __nodepool_file_nodepool_launcher_service_dest: /etc/systemd/system/nodepool-launcher.service
 __nodepool_file_nodepool_launcher_service_mode: 0644
@@ -36,4 +36,4 @@ __nodepool_file_nodepool_launcher_service_src: etc/systemd/system/nodepool-launc
 
 __nodepool_file_nodepool_launcher_service_config_dest: /etc/systemd/system/nodepool-launcher.service.d/override.conf
 __nodepool_file_nodepool_launcher_service_config_mode: 0644
-__nodepool_file_nodepool_launcher_service_config_src: etc/systemd/system/nodepool-launcher.service.d/redhat.conf
+__nodepool_file_nodepool_launcher_service_config_src: etc/systemd/system/nodepool-launcher.service.d/override.conf
diff --git a/vars/ubuntu.yaml b/vars/ubuntu.yaml
index 0369177..318d359 100644
--- a/vars/ubuntu.yaml
+++ b/vars/ubuntu.yaml
@@ -39,7 +39,7 @@ __nodepool_file_nodepool_builder_service_src: etc/systemd/system/nodepool-builde
 
 __nodepool_file_nodepool_builder_service_config_dest: /etc/systemd/system/nodepool-builder.service.d/override.conf
 __nodepool_file_nodepool_builder_service_config_mode: 0644
-__nodepool_file_nodepool_builder_service_config_src: etc/systemd/system/nodepool-builder.service.d/ubuntu-xenial.conf
+__nodepool_file_nodepool_builder_service_config_src: etc/systemd/system/nodepool-builder.service.d/override.conf
 
 __nodepool_file_nodepool_launcher_service_dest: /etc/systemd/system/nodepool-launcher.service
 __nodepool_file_nodepool_launcher_service_mode: 0644
@@ -47,4 +47,4 @@ __nodepool_file_nodepool_launcher_service_src: etc/systemd/system/nodepool-launc
 
 __nodepool_file_nodepool_launcher_service_config_dest: /etc/systemd/system/nodepool-launcher.service.d/override.conf
 __nodepool_file_nodepool_launcher_service_config_mode: 0644
-__nodepool_file_nodepool_launcher_service_config_src: etc/systemd/system/nodepool-launcher.service.d/ubuntu-xenial.conf
+__nodepool_file_nodepool_launcher_service_config_src: etc/systemd/system/nodepool-launcher.service.d/override.conf