diff --git a/roles/generate-accounts-file/README.rst b/roles/generate-accounts-file/README.rst
index 1e25fd35..2eaf9fac 100644
--- a/roles/generate-accounts-file/README.rst
+++ b/roles/generate-accounts-file/README.rst
@@ -12,8 +12,8 @@ which may be there.
 
 **Role Variables**
 
-.. zuul:rolevar:: tempest_concurrency
-   :default: 2
+.. zuul:rolevar:: tempest_account_concurrency
+   :default: 3
 
    A number of parallel test processes.
 
diff --git a/roles/generate-accounts-file/defaults/main.yaml b/roles/generate-accounts-file/defaults/main.yaml
index 5d8a1761..71123aa1 100644
--- a/roles/generate-accounts-file/defaults/main.yaml
+++ b/roles/generate-accounts-file/defaults/main.yaml
@@ -1,7 +1,8 @@
-# Here, we set tempest_concurrency to 3 because with concurrency 2 generate
-# only 10 accounts, and sometimes the tests fail because the account is being
-# used by another test, so it's a good idea to have tempest_concurrency always
-# bigger then tempest test concurrency (in our jobs is set to 2)
-tempest_concurrency: 3
+# Here, we set tempest_account_concurrency to 3 because with concurrency 2
+# generate only 10 accounts, and sometimes the tests fail because the account
+# is being used by another test, so it's a good idea to have
+# tempest_account_concurrency alway bigger then tempest test concurrency
+# (in our jobs is set to 2)
+tempest_account_concurrency: 3
 virtualenvs:
     tempest: ~/.virtualenvs/.tempest
diff --git a/roles/generate-accounts-file/tasks/main.yaml b/roles/generate-accounts-file/tasks/main.yaml
index 9a158566..303c44fb 100644
--- a/roles/generate-accounts-file/tasks/main.yaml
+++ b/roles/generate-accounts-file/tasks/main.yaml
@@ -46,7 +46,7 @@
         printenv
         tempest account-generator \
             --config-file ./etc/tempest.conf \
-            --concurrency {{ tempest_concurrency }} \
+            --concurrency {{ tempest_account_concurrency }} \
             etc/accounts.yaml
     args:
         executable: /bin/bash