diff --git a/bin/deploy_bosh b/bin/deploy_bosh
index 988b6e94..a5847a89 100755
--- a/bin/deploy_bosh
+++ b/bin/deploy_bosh
@@ -111,7 +111,8 @@ generate_manifest_aws() {
   generate_manifest_generic "$bosh_env" \
     --var-file private_key="${key_filename}"\
     --vars-file "${bosh_env}/director-secrets.yml"  \
-    --ops-file "$(repo_directory)/bosh-deployment/aws/cpi.yml"
+    --ops-file "$(repo_directory)/bosh-deployment/aws/cpi.yml" \
+    --ops-file "$(repo_directory)/manifests/ops-files/iaas/aws/bosh/tags.yml"
 }
 
 generate_manifest_generic() {
diff --git a/manifests/ops-files/iaas/aws/bosh/tags.yml b/manifests/ops-files/iaas/aws/bosh/tags.yml
new file mode 100644
index 00000000..e7b8dbdf
--- /dev/null
+++ b/manifests/ops-files/iaas/aws/bosh/tags.yml
@@ -0,0 +1,4 @@
+- type: replace
+  path: /tags?
+  value:
+    director_name: ((director_name))
diff --git a/src/kubo-deployment-tests/deploy_bosh_test.go b/src/kubo-deployment-tests/deploy_bosh_test.go
index 8c691426..5180505f 100644
--- a/src/kubo-deployment-tests/deploy_bosh_test.go
+++ b/src/kubo-deployment-tests/deploy_bosh_test.go
@@ -4,6 +4,7 @@ import (
 	"path"
 
 	"fmt"
+
 	. "github.com/jhvhs/gob-mock"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
@@ -89,6 +90,7 @@ var _ = Describe("Deploy KuBOSH", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(code).To(Equal(0))
 			Expect(stderr).To(gbytes.Say("/bosh-deployment/aws/cpi.yml"))
+			Expect(stderr).To(gbytes.Say("/manifests/ops-files/iaas/aws/bosh/tags.yml"))
 		})
 
 		It("expands the environment path", func() {