diff --git a/README-config.md b/README-config.md
index f7a5b68142d499b4cbd37bd66adc9e0f2c9395a3..a756f67b49aeab860ebc2301c52c85f6faef1c5f 100644
--- a/README-config.md
+++ b/README-config.md
@@ -56,7 +56,7 @@ Example playbook to read config options:
       register: result
     - name: display default login shell
       debug:
-        msg: '{{result.config.defaultlogin }}'
+        msg: '{{ result.config.defaultlogin }}'
 
     - name: ensure defaultloginshell and maxusernamelength are set as required
       ipaconfig:
diff --git a/plugins/modules/ipaconfig.py b/plugins/modules/ipaconfig.py
index 1d40890d1d129953054a2d4a3a212a4614c3b3ec..1239fbc3cf98e354ad1b7511e41cb68eaae7d848 100644
--- a/plugins/modules/ipaconfig.py
+++ b/plugins/modules/ipaconfig.py
@@ -159,7 +159,7 @@ EXAMPLES = '''
       register: result
     - name: display default login shell
       debug:
-        msg: '{{result.config.defaultshell[0] }}'
+        msg: '{{ result.config.defaultshell[0] }}'
 
     - name: set defaultshell and maxusername
       ipaconfig:
diff --git a/roles/ipaserver/tasks/uninstall.yml b/roles/ipaserver/tasks/uninstall.yml
index 71de9faf1fe331c8ceea3c4d3f2d0f98ec952f50..27d8356aea11e031f53d166c3c288c94192cf344 100644
--- a/roles/ipaserver/tasks/uninstall.yml
+++ b/roles/ipaserver/tasks/uninstall.yml
@@ -8,7 +8,7 @@
     -U
     {{ '--ignore-topology-disconnect' if ipaserver_ignore_topology_disconnect
        | bool else '' }}
-    {{ '--ignore-last-of-role' if ipaserver_ignore_last_of_role | bool else ''}}
+    {{ '--ignore-last-of-role' if ipaserver_ignore_last_of_role | bool else '' }}
   register: uninstall
   # 1 means that uninstall failed because IPA server was not configured
   failed_when: uninstall.rc != 0 and uninstall.rc != 1
diff --git a/tests/host/test_host_random.yml b/tests/host/test_host_random.yml
index b5b7a13ae71bd2c838e2f8e19567fcc4986b119d..4a2b3a1e4231dc0c0825cbabf439e16e8573e9e6 100644
--- a/tests/host/test_host_random.yml
+++ b/tests/host/test_host_random.yml
@@ -64,18 +64,18 @@
 
   - assert:
       that:
-      - ipahost.host["{{host1_fqdn }}"].randompassword is
+      - ipahost.host["{{ host1_fqdn }}"].randompassword is
         defined
-      - ipahost.host["{{host2_fqdn }}"].randompassword is
+      - ipahost.host["{{ host2_fqdn }}"].randompassword is
         defined
 
-  - name: Print generated random password for "{{host1_fqdn }}"
+  - name: Print generated random password for "{{ host1_fqdn }}"
     debug:
-      var: ipahost.host["{{host1_fqdn }}"].randompassword
+      var: ipahost.host["{{ host1_fqdn }}"].randompassword
 
-  - name: Print generated random password for "{{host2_fqdn }}"
+  - name: Print generated random password for "{{ host2_fqdn }}"
     debug:
-      var: ipahost.host["{{host2_fqdn }}"].randompassword
+      var: ipahost.host["{{ host2_fqdn }}"].randompassword
 
   - name: Enrolled host "{{ ansible_facts['fqdn'] }}" fails to set random password with update_password always
     ipahost:
diff --git a/tests/vault/env_cleanup.yml b/tests/vault/env_cleanup.yml
index e545e791b190122833d8a4b4c1b1abe6a38b553b..30c0e0d74e8dc43a3bf2720e75f0e9ee8eab7f1f 100644
--- a/tests/vault/env_cleanup.yml
+++ b/tests/vault/env_cleanup.yml
@@ -7,7 +7,7 @@
       - stdvault
       - symvault
       - asymvault
-      username: "{{username}}"
+      username: "{{ username }}"
       state: absent
     loop:
       - admin
diff --git a/tests/vault/tasks_vault_members.yml b/tests/vault/tasks_vault_members.yml
index b293713ce10dfc2cc7e8bf3460f896358c12891a..9bacb63d5e02ec563e8f3c962696259b18190c6f 100644
--- a/tests/vault/tasks_vault_members.yml
+++ b/tests/vault/tasks_vault_members.yml
@@ -6,8 +6,8 @@
   - name: Ensure vault is present
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
-      vault_type: "{{vault.vault_type}}"
+      name: "{{ vault.name }}"
+      vault_type: "{{ vault.vault_type }}"
     register: result
     failed_when: not result.changed or result.failed
     when: vault.vault_type == 'standard'
@@ -15,9 +15,9 @@
   - name: Ensure vault is present
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       vault_password: SomeVAULTpassword
-      vault_type: "{{vault.vault_type}}"
+      vault_type: "{{ vault.vault_type }}"
     register: result
     failed_when: not result.changed or result.failed
     when: vault.vault_type == 'symmetric'
@@ -27,7 +27,7 @@
       ipaadmin_password: SomeADMINpassword
       name: "{{ vault.name }}"
       vault_type: "{{ vault.vault_type }}"
-      public_key: "{{lookup('file', 'A_private.b64')}}"
+      public_key: "{{ lookup('file', 'A_private.b64') }}"
     register: result
     failed_when: not result.changed or result.failed
     when: vault.vault_type == 'asymmetric'
@@ -35,7 +35,7 @@
   - name: Ensure vault member user is present.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       users:
       - user02
@@ -45,7 +45,7 @@
   - name: Ensure vault member user is present, again.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       users:
       - user02
@@ -55,7 +55,7 @@
   - name: Ensure more vault member users are present.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       users:
       - admin
@@ -66,7 +66,7 @@
   - name: Ensure vault member user is still present.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       users:
       - user02
@@ -76,7 +76,7 @@
   - name: Ensure vault users are absent.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       users:
       - admin
@@ -88,7 +88,7 @@
   - name: Ensure vault users are absent, again.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       users:
       - admin
@@ -100,7 +100,7 @@
   - name: Ensure vault user is absent, once more.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       users:
       - admin
@@ -111,7 +111,7 @@
   - name: Ensure vault member group is present.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       groups: vaultgroup
     register: result
@@ -120,7 +120,7 @@
   - name: Ensure vault member group is present, again.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       groups: vaultgroup
     register: result
@@ -129,7 +129,7 @@
   - name: Ensure vault member group is absent.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       groups: vaultgroup
       state: absent
@@ -139,7 +139,7 @@
   - name: Ensure vault member group is absent, again.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       groups: vaultgroup
       state: absent
@@ -149,7 +149,7 @@
   - name: Ensure vault member service is present.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       services: "HTTP/{{ ansible_facts['fqdn'] }}"
     register: result
@@ -158,7 +158,7 @@
   - name: Ensure vault member service is present, again.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       services: "HTTP/{{ ansible_facts['fqdn'] }}"
     register: result
@@ -167,7 +167,7 @@
   - name: Ensure vault member service is absent.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       services: "HTTP/{{ ansible_facts['fqdn'] }}"
       state: absent
@@ -177,7 +177,7 @@
   - name: Ensure vault member service is absent, again.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       action: member
       services: "HTTP/{{ ansible_facts['fqdn'] }}"
       state: absent
@@ -187,7 +187,7 @@
   - name: Ensure user03 is an owner of vault.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       owners: user03
       action: member
     register: result
@@ -196,7 +196,7 @@
   - name: Ensure user03 is an owner of vault, again.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       owners: user03
       action: member
     register: result
@@ -205,7 +205,7 @@
   - name: Ensure user03 is not owner of vault.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       owners: user03
       state: absent
       action: member
@@ -215,7 +215,7 @@
   - name: Ensure user03 is not owner of vault, again.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       owners: user03
       state: absent
       action: member
@@ -225,7 +225,7 @@
   - name: Ensure vaultgroup is an ownergroup of vault.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       ownergroups: vaultgroup
       action: member
     register: result
@@ -234,7 +234,7 @@
   - name: Ensure vaultgroup is an ownergroup of vault, again.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       ownergroups: vaultgroup
       action: member
     register: result
@@ -243,7 +243,7 @@
   - name: Ensure vaultgroup is not ownergroup of vault.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       ownergroups: vaultgroup
       state: absent
       action: member
@@ -253,7 +253,7 @@
   - name: Ensure vaultgroup is not ownergroup of vault, again.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       ownergroups: vaultgroup
       state: absent
       action: member
@@ -263,7 +263,7 @@
   - name: Ensure service is an owner of vault.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       ownerservices: "HTTP/{{ ansible_facts['fqdn'] }}"
       action: member
     register: result
@@ -272,7 +272,7 @@
   - name: Ensure service is an owner of vault, again.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       ownerservices: "HTTP/{{ ansible_facts['fqdn'] }}"
       action: member
     register: result
@@ -281,7 +281,7 @@
   - name: Ensure service is not owner of vault.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       ownerservices: "HTTP/{{ ansible_facts['fqdn'] }}"
       state: absent
       action: member
@@ -291,25 +291,25 @@
   - name: Ensure service is not owner of vault, again.
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       ownerservices: "HTTP/{{ ansible_facts['fqdn'] }}"
       state: absent
       action: member
     register: result
     failed_when: result.changed or result.failed
 
-  - name: Ensure {{vault.vault_type}} vault is absent
+  - name: Ensure {{ vault.vault_type }} vault is absent
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       state: absent
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: Ensure {{vault.vault_type}} vault is absent, again
+  - name: Ensure {{ vault.vault_type }} vault is absent, again
     ipavault:
       ipaadmin_password: SomeADMINpassword
-      name: "{{vault.name}}"
+      name: "{{ vault.name }}"
       state: absent
     register: result
     failed_when: result.changed or result.failed