diff --git a/defaults/main.yml b/defaults/main.yml
index 6a4a0525f8b5f88f4889d5e046a0ee6c1ff28b94..1afebdf168b414ea1b073ba439efcaaa2d7e0cc4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,6 +2,7 @@
 smb_interface: eth0
 
 smb_domain: "TEST"
+smb_netbios_name: "{{ inventory_hostname_short }}"
 
 sophos_pkg: http://artifactory.esss.lu.se/artifactory/swi-pkg/sophos/sophos-av.9.15.1.tar.bz2
 sophos_install_opts: "--update-free --acceptlicence --autostart=true --enableOnBoot=true --automatic --ignore-existing-installation --update-source-type=f --update-period=1 --preferFanotify=true"
diff --git a/templates/smb.conf.j2 b/templates/smb.conf.j2
index 3977f2462ab7aea288da90316d8e7a7cbae5b96b..de793a25d277fd37b44c067ac49d829bf1c37de0 100644
--- a/templates/smb.conf.j2
+++ b/templates/smb.conf.j2
@@ -2,6 +2,7 @@
 [global]
        workgroup = {{ smb_domain }}
         security = ADS
+        netbios name = "{{ smb_netbios_name }}"
 
         log level = 3
         log file = /var/log/samba/samba.log