diff --git a/tasks/drone-server.yml b/tasks/drone-server.yml
index 7b29464..f3bbd78 100644
--- a/tasks/drone-server.yml
+++ b/tasks/drone-server.yml
@@ -48,8 +48,8 @@
     volumes:
       - "{{ drone_sqlite_dir }}:/data"
     env_file: /etc/drone/drone-server.env
-  when: (drone_server_config is defined and drone_server_config.changed) or
-        (drone_sqlite_folder is defined and drone_sqlite_folder.changed) or
+  when: ((drone_server_config is defined and drone_server_config.changed) or
+        (drone_sqlite_folder is defined and drone_sqlite_folder.changed)) and
         drone_database_driver == "sqlite"
   tags:
     - drone-server
@@ -68,8 +68,8 @@
     volumes:
       - "{{ drone_sqlite_dir }}:/data"
     env_file: /etc/drone/drone-server.env
-  when: (drone_server_config is defined and drone_server_config.changed) or
-        (drone_postgres_data_dir is defined and drone_postgres_data_dir.changed) or
+  when: ((drone_server_config is defined and drone_server_config.changed) or
+        (drone_postgres_data_dir is defined and drone_postgres_data_dir.changed)) and
         drone_database_driver != "sqlite"
   tags:
     - drone-server