diff --git a/roles/common/tasks/apt.yaml b/roles/common/tasks/apt.yaml
index eb30aba..39ae20b 100644
--- a/roles/common/tasks/apt.yaml
+++ b/roles/common/tasks/apt.yaml
@@ -8,7 +8,7 @@
 - name: "Update machine"
   apt:
     update_cache: yes
-    upgrade: yes
+    upgrade: "yes"
     autoclean: yes
     autoremove: yes
 
diff --git a/roles/mariadb/tasks/main.yaml b/roles/mariadb/tasks/main.yaml
index dcae45c..c643cb3 100644
--- a/roles/mariadb/tasks/main.yaml
+++ b/roles/mariadb/tasks/main.yaml
@@ -15,5 +15,5 @@
 - name: Allow mysql port via ufw
   community.general.ufw:
     rule: allow
-    port: 3306
+    port: "3306"
     proto: tcp
diff --git a/roles/postgresql/tasks/main.yaml b/roles/postgresql/tasks/main.yaml
index aebd49d..1d722ec 100644
--- a/roles/postgresql/tasks/main.yaml
+++ b/roles/postgresql/tasks/main.yaml
@@ -15,5 +15,5 @@
 - name: Allow postgresql port via ufw
   community.general.ufw:
     rule: allow
-    port: 5432
+    port: "5432"
     proto: tcp
diff --git a/roles/smtpgateway/tasks/main.yaml b/roles/smtpgateway/tasks/main.yaml
index e1d452c..3a44146 100644
--- a/roles/smtpgateway/tasks/main.yaml
+++ b/roles/smtpgateway/tasks/main.yaml
@@ -18,7 +18,7 @@
     dest: /etc/postfix/main.cf
 
 - name: Build /etc/mailname
-  command: hostname --fqdn > /etc/mailname
+  shell: hostname --fqdn > /etc/mailname
 
 - name: Build hashtable of SASL creds
   command: postmap /etc/postfix/sasl_passwd