diff --git a/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml b/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml
index 8c530e903f..f4c4c7eb11 100644
--- a/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml
+++ b/roles/copr/backend/files/provision/builderpb-aws-x86_64.yml
@@ -3,7 +3,7 @@
   gather_facts: False
 
   roles:
-    - { role: spawner, arch: x86_64 }
+    - spawner
 
   vars_files:
     - vars.yml
diff --git a/roles/copr/backend/files/provision/roles/spawner/tasks/main.yml b/roles/copr/backend/files/provision/roles/spawner/tasks/main.yml
index a90c6d5302..9de60716ca 100644
--- a/roles/copr/backend/files/provision/roles/spawner/tasks/main.yml
+++ b/roles/copr/backend/files/provision/roles/spawner/tasks/main.yml
@@ -3,4 +3,4 @@
   register: date
 
 - name: set vm_name variable
-  set_fact: vm_name="copr-builder-{{ arch }}-{{ date.stdout }}"
+  set_fact: vm_name="copr-{% if devel is defined %}dev{% else %}prod{% endif %}-builder-{{ arch }}-{{ date.stdout }}"
diff --git a/roles/copr/backend/templates/provision/vars.yml b/roles/copr/backend/templates/provision/vars.yml
index ecaa38465e..a3f60e1c45 100644
--- a/roles/copr/backend/templates/provision/vars.yml
+++ b/roles/copr/backend/templates/provision/vars.yml
@@ -1,5 +1,2 @@
 ---
 devel: {% if devel %}true{% else %}false{% endif %}
-
-{# 2015-07-09T16:59:26.896629Z => 20150709_165926_896629 #}
-builder_uniq_suffix: "{{ '{{' }} ansible_date_time.iso8601_micro | regex_replace('[-:Z]', '') | regex_replace('[T\\.]', '_') }}"