diff --git a/concourse/tasks/bosh_update_cloud_config.yml b/concourse/tasks/bosh_update_cloud_config.yml
index 9d15008e3..0f74b49a1 100644
--- a/concourse/tasks/bosh_update_cloud_config.yml
+++ b/concourse/tasks/bosh_update_cloud_config.yml
@@ -29,4 +29,4 @@ params:
    BOSH_CLIENT_SECRET:
    BOSH_CA_CERT:
    VARS_FILES_SUFFIX: cloud-vars.yml
-   OPS_FILES_SUFFIX:  cloud-operator.yml
+   OPS_FILES_SUFFIX:  cloud-operators.yml
diff --git a/concourse/tasks/bosh_update_runtime_config.yml b/concourse/tasks/bosh_update_runtime_config.yml
index 4d49bfdfb..9da14c089 100644
--- a/concourse/tasks/bosh_update_runtime_config.yml
+++ b/concourse/tasks/bosh_update_runtime_config.yml
@@ -30,4 +30,4 @@ params:
    BOSH_CLIENT_SECRET:
    BOSH_CA_CERT:
    VARS_FILES_SUFFIX: runtime-vars.yml
-   OPS_FILES_SUFFIX:  runtime-operator.yml
+   OPS_FILES_SUFFIX:  runtime-operators.yml
diff --git a/spec/tasks/bosh_update_cloud_config/task_spec.rb b/spec/tasks/bosh_update_cloud_config/task_spec.rb
index 090f00f01..8b3471382 100644
--- a/spec/tasks/bosh_update_cloud_config/task_spec.rb
+++ b/spec/tasks/bosh_update_cloud_config/task_spec.rb
@@ -12,9 +12,9 @@
       @secrets = Dir.mktmpdir
 
       FileUtils.touch(File.join(@config_manifest, 'my-custom-cloud-vars.yml'))
-      FileUtils.touch(File.join(@config_manifest, 'my-custom-cloud-operator.yml'))
+      FileUtils.touch(File.join(@config_manifest, 'my-custom-cloud-operators.yml'))
       FileUtils.touch(File.join(@config_manifest, 'my-custom-runtime-vars.yml'))
-      FileUtils.touch(File.join(@config_manifest, 'my-custom-runtime-operator.yml'))
+      FileUtils.touch(File.join(@config_manifest, 'my-custom-runtime-operators.yml'))
 
       @output = execute('-c concourse/tasks/bosh_update_cloud_config.yml ' \
         '-i script-resource=. ' \
@@ -37,7 +37,7 @@
     end
 
     it 'selects only config operators' do
-      expect(@output).to include('Operators detected: <-o ./config-manifest/my-custom-cloud-operator.yml >')
+      expect(@output).to include('Operators detected: <-o ./config-manifest/my-custom-cloud-operators.yml >')
     end
 
     it 'selects only config vars' do
diff --git a/spec/tasks/bosh_update_runtime_config/task_spec.rb b/spec/tasks/bosh_update_runtime_config/task_spec.rb
index b2f7a9950..4bbc44163 100644
--- a/spec/tasks/bosh_update_runtime_config/task_spec.rb
+++ b/spec/tasks/bosh_update_runtime_config/task_spec.rb
@@ -12,9 +12,9 @@
       @secrets = Dir.mktmpdir
 
       FileUtils.touch(File.join(@config_manifest, 'my-custom-config-vars.yml'))
-      FileUtils.touch(File.join(@config_manifest, 'my-custom-config-operator.yml'))
+      FileUtils.touch(File.join(@config_manifest, 'my-custom-config-operators.yml'))
       FileUtils.touch(File.join(@config_manifest, 'my-custom-runtime-vars.yml'))
-      FileUtils.touch(File.join(@config_manifest, 'my-custom-runtime-operator.yml'))
+      FileUtils.touch(File.join(@config_manifest, 'my-custom-runtime-operators.yml'))
 
       @output = execute('-c concourse/tasks/bosh_update_runtime_config.yml ' \
         '-i script-resource=. ' \
@@ -40,7 +40,7 @@
     end
 
     it 'selects only runtime operators' do
-      expect(@output).to include('Operators detected: <-o ./config-manifest/my-custom-runtime-operator.yml >')
+      expect(@output).to include('Operators detected: <-o ./config-manifest/my-custom-runtime-operators.yml >')
     end
 
     it 'selects only runtime vars' do