diff --git a/ansible/etc/systemd/system/loki-backup.service.j2 b/ansible/etc/systemd/system/loki-backup.service.j2
new file mode 100644
index 0000000..fdce049
--- /dev/null
+++ b/ansible/etc/systemd/system/loki-backup.service.j2
@@ -0,0 +1,8 @@
+[Unit]
+Description=Backup Loki server
+
+[Service]
+WorkingDirectory={{ loki_dir }}
+Type=oneshot
+ExecStartPre={{ loki_dir }}/registry-cleaner.sh
+ExecStart={{ loki_dir }}/backup.sh -b
diff --git a/ansible/etc/systemd/system/loki-backup.timer.j2 b/ansible/etc/systemd/system/loki-backup.timer.j2
new file mode 100644
index 0000000..8bb017f
--- /dev/null
+++ b/ansible/etc/systemd/system/loki-backup.timer.j2
@@ -0,0 +1,10 @@
+[Unit]
+Description=Back up Loki once a week
+
+[Timer]
+OnCalendar=weekly
+AccuracySec=1h
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff --git a/loki-server.service b/ansible/etc/systemd/system/loki-server.service.j2
similarity index 89%
rename from loki-server.service
rename to ansible/etc/systemd/system/loki-server.service.j2
index 2a3906e..235edc8 100644
--- a/loki-server.service
+++ b/ansible/etc/systemd/system/loki-server.service.j2
@@ -3,7 +3,7 @@ Description=Dockerised web server
 After=docker.service
 
 [Service]
-WorkingDirectory=/root/Loki
+WorkingDirectory={{ loki_dir }}
 Environment="COMPOSE_HTTP_TIMEOUT=300"
 ExecStart=/usr/bin/docker-compose up
 ExecStop=/usr/bin/docker-compose down
diff --git a/ansible/loki.yml b/ansible/loki.yml
index 68a7064..836856b 100644
--- a/ansible/loki.yml
+++ b/ansible/loki.yml
@@ -6,7 +6,6 @@
 
   vars:
     - debian_release: buster
-    - loki_dir: /srv/loki
 
   tasks:
 
@@ -62,33 +61,19 @@
       register: loki_git
 
     - block:
-        - name: Install Loki service
-          command: cp "{{ loki_dir }}"/loki-server.service /lib/systemd/system/
+        - name: Update
+          command: ./update.sh
+          args:
+            chdir: "{{ loki_dir }}"
 
-        - name: Update service file
-          lineinfile:
-            path: /lib/systemd/system/loki-server.service
-            regexp: '^WorkingDirectory='
-            line: 'WorkingDirectory={{ loki_dir }}'
+      rescue:
+        - debug:
+            msg: "Failed to pull containers from registry - will build locally"
 
-        - name: Reload systemd daemon
-          systemd:
-            daemon_reload: yes
-
-        - block:
-            - name: Update
-              command: ./update.sh
-              args:
-                chdir: "{{ loki_dir }}"
-
-          rescue:
-            - debug:
-                msg: "Failed to pull containers from registry - will build locally"
-
-            - name: Build locally
-              command: make build-all
-              args:
-                chdir: "{{ loki_dir }}"
+        - name: Build locally
+          command: make build-all
+          args:
+            chdir: "{{ loki_dir }}"
 
       when: loki_git is changed
 
@@ -100,8 +85,46 @@
         dest: /etc/hosts
         mode: 0644
 
-    - name: Ensure service is started
+    # -------------------------------------------------------------------------
+    # Loki server service.
+    # -------------------------------------------------------------------------
+
+    - name: Install Loki server
+      template:
+        src: ./etc/systemd/system/loki-server.service.j2
+        dest: /etc/systemd/system/loki-server.service
+        mode: 0644
+
+    - name: Enable and start Loki server
       service:
         name: loki-server
         state: started
         enabled: yes
+
+    # -------------------------------------------------------------------------
+    # Loki backup service.
+    # -------------------------------------------------------------------------
+
+    - name: Create GitLab credentials file
+      template:
+        src: ./gitlab.cred.j2
+        dest: "{{ loki_dir }}/gitlab.cred"
+        mode: 0644
+
+    - name: Install Loki backup service
+      template:
+        src: ./etc/systemd/system/loki-backup.service.j2
+        dest: /etc/systemd/system/loki-backup.service
+        mode: 0644
+
+    - name: Install Loki backup timer
+      template:
+        src: ./etc/systemd/system/loki-backup.timer.j2
+        dest: /etc/systemd/system/loki-backup.timer
+        mode: 0644
+
+    - name: Enable and start Loki backup
+      service:
+        name: loki-backup.timer
+        state: started
+        enabled: yes