diff --git a/tasks/filebeat.yml b/tasks/filebeat.yml
index 9948b0c7e35e498536cdb9700b23b22f2a6989be..4d8790353116eba865fbb25835b913c2dfa0c85c 100644
--- a/tasks/filebeat.yml
+++ b/tasks/filebeat.yml
@@ -1,6 +1,6 @@
 - name: Add filebeat repository (Debian | Ubuntu)
   become: true
-  when: {{ ansible_os_family == 'Debian' }}
+  when: ansible_os_family == 'Debian'
   block:
     - name: Ensure Apt Can Use Https
       ansible.builtin.apt:
@@ -26,11 +26,11 @@
     gpgcheck: true
     gpgkey: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'
     state: present
-  when: {{ ansible_os_family == 'RedHat' }}
+  when: ansible_os_family == 'RedHat'
   become: true
 
 - name: Install filebeat package
   ansible.builtin.package:
     name: filebeat
     state: present
-  become: true
\ No newline at end of file
+  become: true
diff --git a/tasks/main.yml b/tasks/main.yml
index 8c43a4f1ccaf4528644fa7d2d89d12eccdd9766d..e89629275f8baeaf1bd5d9ad1d48dc0acf59fe12 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,23 +6,25 @@
   become: true
 
 - name: Add sidecar repo (Debian | Ubuntu)
-  when: {{ ansible_os_family == 'Debian' }}
+  when: ansible_os_family == 'Debian'
   become: true
   block:
     - name: Download repository file
       ansible.builtin.get_url:
         url: "{{ sidecar_repo_urls['Debian'] }}"
         dest: /tmp/graylog-sidecar-repository.deb
+        mode: 0644
 
     - name: Add repository using dpkg
       ansible.builtin.command:
         cmd: dpkg -i /tmp/graylog-sidecar-repository.deb
+      changed_when: false
 
 - name: Add sidecar repo (RedHat)
   ansible.builtin.yum:
     name: "{{ sidecar_repo_urls['RedHat'] }}"
     state: present
-  when: {{ ansible_os_family == 'RedHat' }}
+  when: ansible_os_family == 'RedHat'
   become: true
 
 - name: Install sidecar package
@@ -57,7 +59,7 @@
 - name: Install filebeat
   ansible.builtin.import_tasks:
     - filebeat.yml
-  when: {{ install_filebeat }}
+  when: install_filebeat
 
 - name: Switch back to default policy
   ansible.builtin.command: