diff --git a/README.md b/README.md
index 7f420bf..6e74940 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,8 @@ Role Variables
 Defaults:
 
 ```
+hostname: {{ inventory_hostname }}
+update_hostname: no
 locales_gen:
   - en_US.UTF-8
   - de_DE.UTF-8
diff --git a/defaults/main.yml b/defaults/main.yml
index 704fcab..aba2422 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,7 @@
 ---
 # defaults file for common
+hostname: '{{ inventory_hostname }}'
+update_hostname: yes
 locales_gen:
   - en_US.UTF-8
   - de_DE.UTF-8
diff --git a/tasks/main.yml b/tasks/main.yml
index d5fc883..c4d52c3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,10 @@
 ---
 # tasks file for common
+- name: Update hostname
+  become: true
+  hostname:
+    name: '{{ hostname }}'
+  when: hostname and update_hostname == True
 
 - name: Firewall
   become: true