diff --git a/.gitignore b/.gitignore
index dd6f0e7..e26c466 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-.vagrant
 .playbook
-/environments/
+.vagrant
+.vscode
+/environments/
\ No newline at end of file
diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml
index 95d98a5..227dc83 100644
--- a/roles/base/defaults/main.yml
+++ b/roles/base/defaults/main.yml
@@ -1,6 +1,7 @@
+allow_reboot: true
+manage_firewall: true
 manage_network: false
 network_type: static
-allow_reboot: true
 
 packages:
   - apache2-utils
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index aec925c..b8cf6a2 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -9,6 +9,7 @@
 - name: Import Firewall tasks
   ansible.builtin.import_tasks: firewall.yml
   tags: firewall
+  when: manage_firewall
 
 - name: Import Network tasks
   ansible.builtin.import_tasks: network.yml
diff --git a/roles/base/tasks/samba.yml b/roles/base/tasks/samba.yml
index a580adb..0fffd1d 100644
--- a/roles/base/tasks/samba.yml
+++ b/roles/base/tasks/samba.yml
@@ -50,3 +50,4 @@
     from: "{{ item }}"
     state: enabled
   loop: "{{ samba.firewall }}"
+  when: manage_firewall
diff --git a/roles/base/templates/smb.conf.j2 b/roles/base/templates/smb.conf.j2
index 5884176..a38cbb3 100644
--- a/roles/base/templates/smb.conf.j2
+++ b/roles/base/templates/smb.conf.j2
@@ -13,7 +13,16 @@
 [{{ share.name }}]
    path = {{ share.path }}
    browsable = yes
+{% if share.guest_allow is defined and share.guest_allow %}
+   guest ok = yes
+{% else %}
    guest ok = no
+{% endif %}
    read only = {{ 'yes' if share.read_only | default(false) else 'no' }}
+{% if share.valid_users is defined %}
    valid users = {{ share.valid_users }}
+{% endif %}
+{% if share.force_user is defined %}
+   force user = {{ share.force_user }}
+{% endif %}
 {% endfor %}