diff --git a/aws/fiware/dome-wallet/wallet-driving/templates/role-binding.yaml b/aws/fiware/dome-wallet/wallet-driving/templates/role-binding.yaml
new file mode 100644
index 00000000..b5ea3ac7
--- /dev/null
+++ b/aws/fiware/dome-wallet/wallet-driving/templates/role-binding.yaml
@@ -0,0 +1,15 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-cs-rb
+  labels:
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+subjects:
+  - kind: ServiceAccount
+    name: wallet-driving-sa
+    namespace: {{ .Release.Namespace | quote }}
+roleRef:
+  kind: Role
+  name: {{ .Release.Name }}-ca-scc-anyuid
+  apiGroup: rbac.authorization.k8s.io
\ No newline at end of file
diff --git a/aws/fiware/dome-wallet/wallet-driving/templates/role.yaml b/aws/fiware/dome-wallet/wallet-driving/templates/role.yaml
index d237f4aa..10c8fd8d 100644
--- a/aws/fiware/dome-wallet/wallet-driving/templates/role.yaml
+++ b/aws/fiware/dome-wallet/wallet-driving/templates/role.yaml
@@ -1,14 +1,17 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: wallet-driving
+  name: {{ .Release.Name }}-ca-scc-anyuid
+  labels:
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 rules:
-  - apiGroups:
-      - security.openshift.io
-    resourceNames:
-      - anyuid
-      - privileged
-    resources:
-      - securitycontextconstraints
-    verbs:
-      - use
+- apiGroups:
+  - security.openshift.io
+  resourceNames:
+  - anyuid
+  - privileged
+  resources:
+  - securitycontextconstraints
+  verbs:
+  - use
\ No newline at end of file
diff --git a/aws/fiware/dome-wallet/wallet-driving/templates/rolebinding.yaml b/aws/fiware/dome-wallet/wallet-driving/templates/rolebinding.yaml
deleted file mode 100644
index 30c39d7f..00000000
--- a/aws/fiware/dome-wallet/wallet-driving/templates/rolebinding.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: wallet-driving-rb
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: wallet-driving
-subjects:
-  - kind: ServiceAccount
-    name: wallet-driving-sa
-    namespace: fiware
\ No newline at end of file
diff --git a/aws/fiware/dome-wallet/wallet-driving/templates/service-account.yaml b/aws/fiware/dome-wallet/wallet-driving/templates/service-account.yaml
new file mode 100644
index 00000000..5edf3517
--- /dev/null
+++ b/aws/fiware/dome-wallet/wallet-driving/templates/service-account.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: wallet-driving-sa
+  labels:
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
\ No newline at end of file
diff --git a/aws/fiware/dome-wallet/wallet-driving/templates/serviceAccount.yaml b/aws/fiware/dome-wallet/wallet-driving/templates/serviceAccount.yaml
deleted file mode 100644
index 931cf22f..00000000
--- a/aws/fiware/dome-wallet/wallet-driving/templates/serviceAccount.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: wallet-driving-sa
\ No newline at end of file