diff --git a/README.md b/README.md
index 8712eb7..3f1603b 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,7 @@ No specific requirements
 | `samba_shares_root`            | `/srv/shares`            | Directories for the shares are created under this directory.          |
 | `samba_users`                  | []                       | List of dicts defining users that can access shares.                  |
 | `samba_workgroup`              | `WORKGROUP`              | Name of the server workgroup.                                         |
+| `samba_guest_account`          | -                        | Guest account for unknown users                                       |
 
 ### Defining users
 
@@ -135,14 +136,16 @@ A complete overview of share options follows below. Only `name` is required, the
 | `force_create_mode`    | `0664`                          | See the Samba documentation for details.                                                       |
 | `force_directory_mode` | `0775`                          | See the Samba documentation for details.                                                       |
 | `group`                | `users`                         | The user group files in the share will be added to.                                            |
+| `guest_ok`             | -                               | Allow guest access.                                                                            |
 | `name` (required)      | -                               | The name of the share.                                                                         |
 | `owner`                | `root`                          | Set the owner of the path                                                                      |
 | `path`                 | /{{samba_shares_root}}/{{name}} | The path to the share directory.                                                               |
 | `public`               | `no`                            | Controls read access for guest users                                                           |
 | `setype`               | `samba_share_t`                 | The SELinux type of the share directory                                                        |
 | `valid_users`          | -                               | Controls read access for registered users. Use the syntax of the corresponding Samba setting.  |
+| `vfs_objects`          | -                               | See the Samba documentation for details.                                                       |
+| `writable`             | -                               | Writable for guests.                                                                           |
 | `write_list`           | -                               | Controls write access for registered users. Use the syntax of the corresponding Samba setting. |
-| `vfs_objects`          |  -                              | See the Samba documentation for details.                                                       |
 
 The values for `valid_users` and `write_list` should be a comma separated list of users. Names prepended with `+` or `@` are interpreted as groups. The documentation for the [Samba configuration](https://www.samba.org/samba/docs/man/manpages-3/smb.conf.5.html) has more details on these options.
 
diff --git a/templates/smb.conf.j2 b/templates/smb.conf.j2
old mode 100644
new mode 100755
index f2260bd..ca2341c
--- a/templates/smb.conf.j2
+++ b/templates/smb.conf.j2
@@ -23,6 +23,9 @@
   security = {{ samba_security }}
   passdb backend = {{ samba_passdb_backend }}
   map to guest = {{ samba_map_to_guest }}
+{% if samba_guest_account  is defined %}
+  guest account = {{ samba_guest_account }}
+{% endif %}
 
 {% if samba_interfaces|length > 0 %}
   interfaces = {{ samba_interfaces }}
@@ -79,6 +82,12 @@
 {% endif %}
 {% if share.group is defined %}
   force group = {{ share.group }}
+{% endif %}
+{% if share.guest_ok is defined %}
+  guest ok = {{ share.guest_ok }}
+{% endif %}
+{% if share.writable is defined %}
+  writable = {{ share.writable }}
 {% endif %}
   create mode = {{ share.create_mode|default('0664') }}
   force create mode = {{ share.force_create_mode|default('0664') }}