diff --git a/client/tasks/configuration.yml b/client/tasks/configuration.yml
index ffabc847f07277e8af22ceed5d40c73e5c630210..45c2cb762ca99e5f795fe81abd33f5be6a92e117 100644
--- a/client/tasks/configuration.yml
+++ b/client/tasks/configuration.yml
@@ -12,7 +12,6 @@
 
 - name: ensure we have the correct printer
   template: src=lpoptions.j2 dest=/etc/cups/lpoptions owner=root group=root mode=0644
-  when: smb_domain == 'FSMPI' # not ported yet
 
 - name: grant user access to soundcard
   copy: src=udev_audio-perm.rules dest=/etc/udev/rules.d/50-audio-perm.rules owner=root group=root mode=0644
@@ -26,10 +25,10 @@
   copy: src=logrotate/rsyslog dest=/etc/logrotate.d/rsyslog owner=root group=root mode=0644
   when: client_do_rsyslog
 
-#- name: ensure iceweasel default profile stuff is installed
-#  copy: src=iceweasel/ dest=/usr/lib/firefox-esr/ owner=root group=root mode=0644
-#  when: client_provision_mozilla
-#
-#- name: ensure icedove default profile stuff is installed
-#  copy: src=icedove/ dest=/usr/lib/icedove/ owner=root group=root mode=0644
-#  when: client_provision_mozilla
+- name: ensure firefox default profile stuff is installed
+  copy: src=mozilla/firefox/ dest=/usr/lib/firefox-esr/ owner=root group=root mode=0644
+  when: client_provision_mozilla
+
+- name: ensure thunderbird default profile stuff is installed
+  copy: src=mozilla/thunderbird/ dest=/usr/lib/thunderbird/ owner=root group=root mode=0644
+  when: client_provision_mozilla
diff --git a/client/templates/lpoptions.j2 b/client/templates/lpoptions.j2
index 6d5177a91d26e0b6873c689aeb54c910b5fd715f..20216dc2640b19f907642e93aa0b8f5ea6fde43d 100644
--- a/client/templates/lpoptions.j2
+++ b/client/templates/lpoptions.j2
@@ -1,5 +1,8 @@
 {%- if inventory_hostname | regex_replace('[0-9]$', '') == "hoern" or inventory_hostname == "portal" -%}
 Default Hoern_Kopierer Duplex=DuplexNoTumble
+{%- elif inventory_hostname | regex_replace('[0-9]$', '') == "lxc" -%}
+Dest Kopierer_Briefpapier ColorModel=Gray KCRotate=On
+Default Kopierer_BW ColorModel=Gray
 {%- else -%}
 {%- set number = inventory_hostname | regex_replace('^[a-z]*', '') -%}
 Default Kopierer ColorModel=Gray Duplex=DuplexNoTumble OutputBin=MBDWN{{ number }}