diff --git a/openstack/cpi-secondary.yml b/openstack/cpi-secondary.yml
index e2358575..e6d856fd 100644
--- a/openstack/cpi-secondary.yml
+++ b/openstack/cpi-secondary.yml
@@ -10,7 +10,7 @@
 - type: replace
   path: /instance_groups/name=bosh/jobs/-
   value:
-    name: openstack_cpi
+    name: openstack_cpi_golang
     release: bosh-openstack-cpi
 
 # unused values should be overwritten via Director's cpi config
diff --git a/openstack/cpi.yml b/openstack/cpi.yml
index 0c45f5e2..ac342654 100644
--- a/openstack/cpi.yml
+++ b/openstack/cpi.yml
@@ -24,15 +24,15 @@
 - path: /instance_groups/name=bosh/jobs/-
   type: replace
   value:
-    name: openstack_cpi
+    name: openstack_cpi_golang
     release: bosh-openstack-cpi
 - path: /instance_groups/name=bosh/properties/director/cpi_job?
   type: replace
-  value: openstack_cpi
+  value: openstack_cpi_golang
 - path: /cloud_provider/template?
   type: replace
   value:
-    name: openstack_cpi
+    name: openstack_cpi_golang
     release: bosh-openstack-cpi
 - path: /instance_groups/name=bosh/properties/openstack?
   type: replace