diff --git a/handlers.yml b/handlers.yml
index 3a9cc25..e9ec4cb 100644
--- a/handlers.yml
+++ b/handlers.yml
@@ -5,6 +5,10 @@
     state: restarted
     enabled: true
 
+- name: regenerate initramfs
+  become: true
+  command: update-initramfs -u -k all
+
 - name: restart docker service
   become: true
   systemd:
@@ -21,6 +25,7 @@
     daemon_reload: true
 
 - name: restart syncthing service
+  become: true
   systemd:
     name: syncthing@sonny.service
     state: restarted
diff --git a/tasks/network.yml b/tasks/network.yml
index 1a126ac..c698730 100644
--- a/tasks/network.yml
+++ b/tasks/network.yml
@@ -7,38 +7,17 @@
     group: systemd-network
     mode: '0640'
   loop:
-    - { src: 'templates/network/link1.link.j2', dest: '/etc/systemd/network/link1.link' }
+    - {
+        src: 'templates/network/link1.link.j2',
+        dest: '/etc/systemd/network/98-link1.link'
+      }
     - {
         src: 'templates/network/link1.network.j2',
-        dest: '/etc/systemd/network/link1.network',
+        dest: '/etc/systemd/network/98-link1.network',
       }
-  notify: restart systemd-networkd
-
-- name: copy interface restart timer/service
-  become: true
-  template:
-    src: '{{ item.src }}'
-    dest: '{{ item.dest }}'
-    owner: root
-    group: systemd-network
-    mode: '0640'
-  loop:
-    - {
-        src: 'templates/systemd/interface_restart.timer.j2',
-        dest: '/etc/systemd/system/interface-restart.timer',
-      }
-    - {
-        src: 'templates/systemd/interface_restart.service.j2',
-        dest: '/etc/systemd/system/interface-restart.service',
-      }
-  notify: restart systemd-networkd
-
-- name: enable interface restart timer
-  become: true
-  systemd:
-    name: interface-restart.timer
-    state: started
-    enabled: true
+  notify:
+    - restart systemd-networkd
+    - regenerate initramfs
 
 - name: copy /etc/hosts template
   become: true
diff --git a/templates/hosts.j2 b/templates/hosts.j2
index 487e4bd..70f3e67 100644
--- a/templates/hosts.j2
+++ b/templates/hosts.j2
@@ -2,7 +2,7 @@
 
 127.0.0.1 	localhost
 127.0.1.1 	zeus
-{{ lan_ip_address }} 	{{ domain_name }}
+{{ lan_ip }} 	{{ domain_name }}
 
 # The following lines are desirable for IPv6 capable hosts
 #::1     localhost ip6-localhost ip6-loopback
diff --git a/templates/network/link1.network.j2 b/templates/network/link1.network.j2
index 2448938..517a687 100644
--- a/templates/network/link1.network.j2
+++ b/templates/network/link1.network.j2
@@ -5,6 +5,6 @@ Name={{ network_interface }}
 
 [Network]
 DHCP=ipv4
-Address={{ lan_ip_address }}/24
-Gateway={{ lan_ip_address[:-3] }}254
-DNS={{ lan_ip_address[:-3] }}254
+Address={{ lan_ip }}/24
+Gateway={{ lan_gateway }}
+DNS={{ lan_dns }}
diff --git a/templates/systemd/interface_restart.service.j2 b/templates/systemd/interface_restart.service.j2
deleted file mode 100644
index 239f98d..0000000
--- a/templates/systemd/interface_restart.service.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-# {{ ansible_managed }}
-#
-
-[Unit]
-Description=Service which reconfigures the `link1` interface as a temporary workaround for the buggy r8169 driver
-
-[Service]
-ExecStart=/usr/bin/networkctl reconfigure link1
-Type=oneshot
diff --git a/templates/systemd/interface_restart.timer.j2 b/templates/systemd/interface_restart.timer.j2
deleted file mode 100644
index b4372ce..0000000
--- a/templates/systemd/interface_restart.timer.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-# {{ ansible_managed }}
-#
-
-[Unit]
-Description=Hourly service which reconfigures the `link1` network interface
-
-[Timer]
-OnCalendar=hourly
-
-[Install]
-WantedBy=timers.target
diff --git a/vars/network.yml b/vars/network.yml
index c709e92..74081f0 100644
--- a/vars/network.yml
+++ b/vars/network.yml
@@ -1,7 +1,9 @@
 network_interface: 'link1'
-network_mac: '70:85:c2:5a:ce:91'
+network_mac: '00:1b:21:3b:50:e2'
 
-lan_ip_address: '192.168.2.1'
+lan_ip: '192.168.2.1'
+lan_gateway: '192.168.2.254'
+lan_dns: '192.168.2.254'
 domain_name: 'fudiggity.nl'
 
 http_port: 80