diff --git a/create-remote-database-backup.yml b/create-remote-database-backup.yml
index daa7305..e1615e0 100644
--- a/create-remote-database-backup.yml
+++ b/create-remote-database-backup.yml
@@ -47,7 +47,7 @@
         - "stage_{{ stage }}"
         - '{{ database_engine }}'
       when:
-        - database_engine is 'postgres'
+        - database_engine in ['postgres']
 
     - name: "Add {{ database_engine }} servers to hosts if necessary"
       add_host:
@@ -56,7 +56,7 @@
         - "stage_{{ stage }}"
         - '{{ database_engine }}'
       when:
-        - database_engine is 'maria'
+        - database_engine in ['maria']
 
     - name: "Add 'storage' servers to hosts if necessary"
       add_host:
diff --git a/restore-remote-database-backup.yml b/restore-remote-database-backup.yml
index 975d69a..59903a6 100644
--- a/restore-remote-database-backup.yml
+++ b/restore-remote-database-backup.yml
@@ -47,7 +47,7 @@
         - "stage_{{ stage }}"
         - 'restore'
       when:
-        - database_engine is 'postgres'
+        - database_engine in ['postgres']
 
     - name: "Add {{ database_engine }}-restore servers to hosts if necessary"
       add_host:
@@ -56,7 +56,7 @@
         - "stage_{{ stage }}"
         - 'restore'
       when:
-        - database_engine is 'maria'
+        - database_engine in ['maria']
       
     - name: "Add 'backup' servers to hosts if necessary"
       add_host: