diff --git a/xos-services/openstack/Chart.yaml b/xos-services/openstack/Chart.yaml
index fd5497b..ab47746 100644
--- a/xos-services/openstack/Chart.yaml
+++ b/xos-services/openstack/Chart.yaml
@@ -17,5 +17,5 @@
 description: A Helm chart for XOS's "openstack" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 1.1.5
+version: 1.1.6
 appVersion: 1.1.5
diff --git a/xos-services/openstack/templates/_tosca.tpl b/xos-services/openstack/templates/_tosca.tpl
index ad56d09..3adabcd 100644
--- a/xos-services/openstack/templates/_tosca.tpl
+++ b/xos-services/openstack/templates/_tosca.tpl
@@ -144,12 +144,6 @@
           name: {{ .cordSiteName }}
           must-exist: true
 
-    {{ .cordDeploymentName }}:
-      type: tosca.nodes.Deployment
-      properties:
-        name: {{ .cordDeploymentName }}
-        must-exist: true
-
     service#openstack:
       type: tosca.nodes.OpenStackService
       properties:
@@ -159,42 +153,18 @@
           admin_password: {{ .keystoneAdminPassword }}
           admin_tenant: {{ .keystoneAdminTenant }}
 
-    {{ .cordSiteName }}_{{ .cordDeploymentName }}_openstack:
-      type: tosca.nodes.Controller
-      requirements:
-        - deployment:
-            node: {{ .cordDeploymentName }}
-            relationship: tosca.relationships.BelongsToOne
-      properties:
-          name: {{ .cordSiteName }}_{{ .cordDeploymentName }}_openstack
-          backend_type: OpenStack
-          version: Newton
-          auth_url: http://keystone.openstack.svc.cluster.local/v3
-          admin_user: {{ .keystoneAdminUser }}
-          admin_password: {{ .keystoneAdminPassword }}
-          admin_tenant: {{ .keystoneAdminTenant }}
-          domain: {{ .keystoneDomain }}
+    # TODO: deal with the lack of controller objects
+    # TODO: All of this probably ends up in OpenStack service after the refactor
+#    {{ .cordSiteName }}_somedeployment_openstack:
+#      type: tosca.nodes.Controller
+#      properties:
+#          name: {{ .cordSiteName }}_somedeployment_openstack
+#          backend_type: OpenStack
+#          version: Newton
+#          auth_url: http://keystone.openstack.svc.cluster.local/v3
+#          admin_user: {{ .keystoneAdminUser }}
+#          admin_password: {{ .keystoneAdminPassword }}
+#          admin_tenant: {{ .keystoneAdminTenant }}
+#          domain: {{ .keystoneDomain }}
 
-    {{ .cordSiteName }}_deployment_{{ .cordDeploymentName }}:
-        type: tosca.nodes.SiteDeployment
-        requirements:
-            - site:
-                node: {{ .cordSiteName }}
-                relationship: tosca.relationships.BelongsToOne
-            - deployment:
-                node: {{ .cordDeploymentName }}
-                relationship: tosca.relationships.BelongsToOne
-            - controller:
-                node: {{ .cordSiteName }}_{{ .cordDeploymentName }}_openstack
-                relationship: tosca.relationships.BelongsToOne
-
-    {{ .cordSiteName }}_openstack_controller:
-        type: tosca.nodes.ControllerSite
-        requirements:
-            - site:
-                node: {{ .cordSiteName }}
-                relationship: tosca.relationships.BelongsToOne
-            - controller:
-                node: {{ .cordSiteName }}_{{ .cordDeploymentName }}_openstack
-                relationship: tosca.relationships.BelongsToOne
 {{- end -}}