diff --git a/aws/roles/bootnode-access/tasks/main.yml b/aws/roles/bootnode-access/tasks/main.yml
index a6e0567..82d0321 100644
--- a/aws/roles/bootnode-access/tasks/main.yml
+++ b/aws/roles/bootnode-access/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 - name: Setup EC2 firewall
   import_tasks: ec2.yml
-  when: ansible_bios_version | search("amazon")
+  when: ansible_bios_version is search("amazon")
diff --git a/aws/roles/explorer-access/tasks/main.yml b/aws/roles/explorer-access/tasks/main.yml
index a6e0567..82d0321 100644
--- a/aws/roles/explorer-access/tasks/main.yml
+++ b/aws/roles/explorer-access/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 - name: Setup EC2 firewall
   import_tasks: ec2.yml
-  when: ansible_bios_version | search("amazon")
+  when: ansible_bios_version is search("amazon")
diff --git a/aws/roles/moc-access/tasks/main.yml b/aws/roles/moc-access/tasks/main.yml
index a6e0567..82d0321 100644
--- a/aws/roles/moc-access/tasks/main.yml
+++ b/aws/roles/moc-access/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 - name: Setup EC2 firewall
   import_tasks: ec2.yml
-  when: ansible_bios_version | search("amazon")
+  when: ansible_bios_version is search("amazon")
diff --git a/aws/roles/netstat-access/tasks/main.yml b/aws/roles/netstat-access/tasks/main.yml
index a6e0567..82d0321 100644
--- a/aws/roles/netstat-access/tasks/main.yml
+++ b/aws/roles/netstat-access/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 - name: Setup EC2 firewall
   import_tasks: ec2.yml
-  when: ansible_bios_version | search("amazon")
+  when: ansible_bios_version is search("amazon")
diff --git a/aws/roles/validator-access/tasks/main.yml b/aws/roles/validator-access/tasks/main.yml
index a6e0567..82d0321 100644
--- a/aws/roles/validator-access/tasks/main.yml
+++ b/aws/roles/validator-access/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 - name: Setup EC2 firewall
   import_tasks: ec2.yml
-  when: ansible_bios_version | search("amazon")
+  when: ansible_bios_version is search("amazon")
diff --git a/roles/bootnode/tasks/main.yml b/roles/bootnode/tasks/main.yml
index 20023ec..14b057c 100644
--- a/roles/bootnode/tasks/main.yml
+++ b/roles/bootnode/tasks/main.yml
@@ -5,7 +5,7 @@
    
 - name: Setup ufw firewall
   import_tasks: ufw.yml
-  when: not ansible_bios_version | search("amazon")
+  when: not ansible_bios_version is search("amazon")
   
 - name: restart machine after setup
   shell: shutdown -r 1
diff --git a/roles/explorer/tasks/main.yml b/roles/explorer/tasks/main.yml
index f7bcdb0..c2f823c 100644
--- a/roles/explorer/tasks/main.yml
+++ b/roles/explorer/tasks/main.yml
@@ -40,7 +40,7 @@
   
 - name: Setup ufw firewall
   import_tasks: ufw.yml
-  when: not ansible_bios_version | search("amazon")
+  when: not ansible_bios_version is search("amazon")
   
 - name: restart machine after setup
   shell: shutdown -r 1
diff --git a/roles/moc/tasks/main.yml b/roles/moc/tasks/main.yml
index 3ea91b2..a7c98e7 100644
--- a/roles/moc/tasks/main.yml
+++ b/roles/moc/tasks/main.yml
@@ -40,7 +40,7 @@
 
 - name: Setup ufw firewall
   import_tasks: ufw.yml
-  when: not ansible_bios_version | search("amazon")
+  when: not ansible_bios_version is search("amazon")
   
 - name: restart machine after setup
   shell: shutdown -r 1
diff --git a/roles/netstat/defaults/main.yml b/roles/netstat/defaults/main.yml
index d8f8c6d..34f7f9f 100644
--- a/roles/netstat/defaults/main.yml
+++ b/roles/netstat/defaults/main.yml
@@ -21,3 +21,5 @@ home: "/home/{{ username }}"
 
 nginx_headers: "off"
 PROXY_PORT: "3000"
+
+reboot_after_completion: true
\ No newline at end of file
diff --git a/roles/netstat/tasks/main.yml b/roles/netstat/tasks/main.yml
index 71d8da9..9a46257 100644
--- a/roles/netstat/tasks/main.yml
+++ b/roles/netstat/tasks/main.yml
@@ -46,7 +46,7 @@
 
 - name: Setup ufw firewall
   import_tasks: ufw.yml
-  when: not ansible_bios_version | search("amazon")
+  when: not ansible_bios_version is search("amazon")
   
 - name: restart machine after setup
   shell: shutdown -r 1
diff --git a/roles/validator/tasks/main.yml b/roles/validator/tasks/main.yml
index b99a5f9..008d041 100644
--- a/roles/validator/tasks/main.yml
+++ b/roles/validator/tasks/main.yml
@@ -41,7 +41,7 @@
   
 - name: Setup ufw firewall
   import_tasks: ufw.yml
-  when: not ansible_bios_version | search("amazon")
+  when: not ansible_bios_version is search("amazon")
   
 - name: restart machine after setup
   shell: shutdown -r 1