diff --git a/tasks/fluentd-client.yml b/tasks/fluentd-client.yml
index 16420457cb06e1b335c4d464902808caa182f65e..6d5f41be41f55c9cc6b6d311a39fd60a979a8a50 100644
--- a/tasks/fluentd-client.yml
+++ b/tasks/fluentd-client.yml
@@ -99,7 +99,7 @@
     append: yes
   tags:
     - Config
-  when: "'gitlabserver' in groups and inventory_hostname in groups.gitlabserver"
+  when: groups and 'gitlabserver' in groups and inventory_hostname in groups.gitlabserver
   ignore_errors: yes
   notify:
     - Restart td-agent
@@ -111,7 +111,7 @@
     append: yes
   tags:
     - Config
-  when: "'webserver' in groups and inventory_hostname in groups.webserver"
+  when: groups and 'webserver' in groups and inventory_hostname in groups.webserver
   ignore_errors: yes
   notify:
     - Restart td-agent
diff --git a/templates/alertalerta.py b/templates/alertalerta.py
index da01957a4452e856736682902adb9f1f2600858a..7db30a24b23162a6a90e11ad00f053d2f93fa099 100755
--- a/templates/alertalerta.py
+++ b/templates/alertalerta.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 Create an Alerta alert