diff --git a/apps/okd/deploy.tf b/apps/okd/deploy.tf
index 962686a..627b52c 100644
--- a/apps/okd/deploy.tf
+++ b/apps/okd/deploy.tf
@@ -52,7 +52,7 @@ resource "kubectl_manifest" "deploy" {
               successThreshold: 1
               timeoutSeconds: 1
           restartPolicy: Always
-          serviceAccount: okd
-          serviceAccountName: okd
+          serviceAccount: "${var.component}-${var.instance}"
+          serviceAccountName: ok"${var.component}-${var.instance}"d
  EOF
 }
diff --git a/apps/okd/index.yaml b/apps/okd/index.yaml
index e337ef1..ed11d40 100644
--- a/apps/okd/index.yaml
+++ b/apps/okd/index.yaml
@@ -6,21 +6,11 @@ metadata:
   name: okd
   description: null
 options:
-  domain-name:
-    default: your_company.com
+  sub-domain:
+    default: okd
     examples:
-    - your_company.com
+    - okd
     type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  namespaces:
-    default: []
-    items:
-      type: string
-    type: array
   images:
     default:
       okd:
@@ -64,31 +54,41 @@ options:
             type: string
         type: object
     type: object
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   cluster-admin:
     default: true
     examples:
     - true
     type: boolean
-  sub-domain:
-    default: okd
+  domain-name:
+    default: your_company.com
     examples:
-    - okd
+    - your_company.com
     type: string
   app-group:
     default: infra
     examples:
     - infra
     type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
   domain:
     default: your-company
     examples:
     - your-company
     type: string
+  namespaces:
+    default: []
+    items:
+      type: string
+    type: array
 dependencies:
 - dist: null
   category: share