diff --git a/group_vars/all b/group_vars/all
index 57793b6..4ae9703 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -33,9 +33,9 @@ common_locales:
 # apt-get common config
 common_apt: True
 common_apt_repositories:
-  - "deb http://gd.tuwien.ac.at/opsys/linux/debian/ {{ ansible_distribution_release }} main contrib non-free"
-  - "deb http://gd.tuwien.ac.at/opsys/linux/debian/ {{ ansible_distribution_release }}-backports main contrib non-free"
-  - "deb http://gd.tuwien.ac.at/opsys/linux/debian/ {{ ansible_distribution_release }}-updates main contrib non-free"
+  - "deb http://cdn.debian.net/debian/ {{ ansible_distribution_release }} main contrib non-free"
+  - "deb http://cdn.debian.net/debian/ {{ ansible_distribution_release }}-backports main contrib non-free"
+  - "deb http://cdn.debian.net/debian/ {{ ansible_distribution_release }}-updates main contrib non-free"
   - "deb http://security.debian.org/debian-security/ {{ ansible_distribution_release }}/updates main contrib non-free"
 common_vim_default: False
 
diff --git a/roles/ariane/tasks/iptables.yml b/roles/ariane/tasks/iptables.yml
index 7210b8c..fe517eb 100644
--- a/roles/ariane/tasks/iptables.yml
+++ b/roles/ariane/tasks/iptables.yml
@@ -1,6 +1,6 @@
 ---
 - name: iptables - install iptables-persistent
-  apt: name=iptables-persistent
+  package: name=iptables-persistent
 
 - name: /etc/iptables/rules.v4
   template: dest=/etc/iptables/rules.v4 src=iptables_rules_v4.j2 owner=root group=root mode=0644
diff --git a/roles/ariane/tasks/lxc.yml b/roles/ariane/tasks/lxc.yml
index 728abf0..82ac740 100644
--- a/roles/ariane/tasks/lxc.yml
+++ b/roles/ariane/tasks/lxc.yml
@@ -1,15 +1,15 @@
 ---
 - name: lxc - install lxc
-  apt: name=lxc
+  package: name=lxc
 
 - name: lxc - install libpam-cgfs
-  apt: name=libpam-cgfs
+  package: name=libpam-cgfs
 
 - name: lxc - install bridge-utils
-  apt: name=bridge-utils
+  package: name=bridge-utils
 
 - name: lxc - install python-lxc
-  apt: name=python-lxc
+  package: name=python-lxc
 
 - name: lxc - /etc/default/lxc-net
   copy:
diff --git a/roles/ariane/tasks/snapper.yml b/roles/ariane/tasks/snapper.yml
index 6ca4564..8c5c5c4 100644
--- a/roles/ariane/tasks/snapper.yml
+++ b/roles/ariane/tasks/snapper.yml
@@ -1,6 +1,6 @@
 ---
 - name: snapper - install snapper
-  apt: name=snapper
+  package: name=snapper
 
 - name: snapper - create-config
   command: snapper create-config /
@@ -16,4 +16,5 @@
   lineinfile:
     dest: /etc/fstab
     line: "{{ snapper_blkid.stdout_lines[0] }} /.snapshots btrfs subvol=.snapshots 0 1"
+  when: snapper_blkid.stdout_lines is defined
   notify: snapper - reload fstab
diff --git a/roles/ariane/tasks/zfs.yml b/roles/ariane/tasks/zfs.yml
index 3ff9900..910ea01 100644
--- a/roles/ariane/tasks/zfs.yml
+++ b/roles/ariane/tasks/zfs.yml
@@ -1,15 +1,15 @@
 ---
 - name: zfs - linux-headers
-  apt: name=linux-headers-{{ ansible_kernel }}
+  package: name=linux-headers-{{ ansible_kernel }}
 
 - name: zfs - install ZoL dkms
-  apt: name=zfs-dkms
+  package: name=zfs-dkms
 
 - name: zfs - install ZoL utils
-  apt: name=zfsutils-linux
+  package: name=zfsutils-linux
 
 - name: zfs - install zfs-auto-snapshot
-  apt: name=zfs-auto-snapshot
+  package: name=zfs-auto-snapshot
 
 - name: zfs - zfs-auto-snapshot find cron files
   shell: find /etc/cron* -type f -name zfs-auto-snapshot
diff --git a/roles/backup/tasks/borg.yml b/roles/backup/tasks/borg.yml
index f35aa98..4fad2c2 100644
--- a/roles/backup/tasks/borg.yml
+++ b/roles/backup/tasks/borg.yml
@@ -1,6 +1,6 @@
 ---
 - name: install borg
-  apt: name="borgbackup" state=present
+  package: name="borgbackup" state=present
 
 - name: create repositories
   file:
diff --git a/roles/backupclient/tasks/borg.yml b/roles/backupclient/tasks/borg.yml
index 83a7122..451b60c 100644
--- a/roles/backupclient/tasks/borg.yml
+++ b/roles/backupclient/tasks/borg.yml
@@ -1,6 +1,6 @@
 ---
 - name: install borg
-  apt: name="borgbackup" state=present
+  package: name="borgbackup" state=present
 
 - name: create backup user
   user:
diff --git a/roles/ups/tasks/main.yml b/roles/ups/tasks/main.yml
index e6240eb..f0f10ec 100644
--- a/roles/ups/tasks/main.yml
+++ b/roles/ups/tasks/main.yml
@@ -1,5 +1,5 @@
 - name: nut - install
-  apt: name=nut
+  package: name=nut
 
 - name: nut - port access device
   command: mknod {{ ups_port }} c {{ ups_port_dev }} creates={{ ups_port }}