diff --git a/tools/docker-compose-minikube/minikube/tasks/main.yml b/tools/docker-compose-minikube/minikube/tasks/main.yml
index 0cf9c841a9..ac29a721a1 100644
--- a/tools/docker-compose-minikube/minikube/tasks/main.yml
+++ b/tools/docker-compose-minikube/minikube/tasks/main.yml
@@ -82,18 +82,11 @@
     name: '{{ minikube_service_account_name }}'
   register: service_account
 
-- name: Register serviceAccount secret name
-  set_fact:
-    _service_account_secret_name: '{{ service_account["resources"][0]["secrets"][0]["name"] }}'
-  when:
-    - service_account["resources"][0]["secrets"] | length
-    - '"name" in service_account["resources"][0]["secrets"][0]'
-
 - name: Retrieve bearer_token from serviceAccount secret
   k8s_info:
     kind: Secret
     namespace: '{{ minikube_service_account_namespace }}'
-    name: '{{ _service_account_secret_name }}'
+    name: '{{ minikube_service_account_name }}'
   register: _service_account_secret
 
 - name: Load Minikube Bearer Token
diff --git a/tools/docker-compose-minikube/minikube/templates/rbac.yml.j2 b/tools/docker-compose-minikube/minikube/templates/rbac.yml.j2
index a015a8e425..8c22060c8a 100644
--- a/tools/docker-compose-minikube/minikube/templates/rbac.yml.j2
+++ b/tools/docker-compose-minikube/minikube/templates/rbac.yml.j2
@@ -36,3 +36,12 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: {{ minikube_service_account_name }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ minikube_service_account_name }}
+  namespace: {{ minikube_service_account_namespace }}
+  annotations:
+    kubernetes.io/service-account.name: {{ minikube_service_account_name }}
+type: kubernetes.io/service-account-token