diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml
index fdb840965..f64c25936 100644
--- a/roles/2-common/tasks/packages.yml
+++ b/roles/2-common/tasks/packages.yml
@@ -14,14 +14,14 @@
     - avahi-tools
   when: is_redhat
 
-- name: Download usbmount -- not in Debian Stretch (debian_9)
+- name: Download usbmount -- not in Debian Stretch (debian-9)
   get_url:
     url: "{{ iiab_download_url }}/usbmount_0.0.14.1_all.deb"
     dest: "{{ downloads_dir }}"
     timeout: "{{ download_timeout }}"
   when: internet_available and is_debian_9
 
-- name: Install usbmount (debian_9)
+- name: Install usbmount (debian-9)
   command: apt install -y {{ downloads_dir }}/usbmount_0.0.14.1_all.deb
   when: is_debian_9
 
diff --git a/roles/kolibri/templates/kolibri.service.j2 b/roles/kolibri/templates/kolibri.service.j2
index ef420c4a1..0b230f7d1 100644
--- a/roles/kolibri/templates/kolibri.service.j2
+++ b/roles/kolibri/templates/kolibri.service.j2
@@ -2,7 +2,7 @@
 Description=Kolibri
 
 [Service]
-Type=oneshot
+Type=forking
 RemainAfterExit=yes
 Environment=KOLIBRI_USER={{ kolibri_user }}
 Environment=KOLIBRI_HOME={{ kolibri_home }}
diff --git a/roles/mongodb/defaults/main.yml b/roles/mongodb/defaults/main.yml
index 2553868fb..6aed9834a 100644
--- a/roles/mongodb/defaults/main.yml
+++ b/roles/mongodb/defaults/main.yml
@@ -1,2 +1,5 @@
 mongodb_install: False
 mongodb_enabled: False
+
+mongodb_db_path: "{{ content_base }}/dbdata/mongodb"    # == /library/dbdata/mongodb/
+mongodb_conf: /etc/mongod.conf
diff --git a/roles/mongodb/tasks/main.yml b/roles/mongodb/tasks/main.yml
index 5ba9a9d83..0bd2fa5a6 100644
--- a/roles/mongodb/tasks/main.yml
+++ b/roles/mongodb/tasks/main.yml
@@ -16,10 +16,10 @@
     owner: mongodb
   with_items:
     - { path: '/var/run/mongodb' }
-    - { path: '/library/dbdata/mongodb' }
+    - { path: "{{ mongodb_db_path }}" }
     - { path: '/var/log/mongodb' }
 
-- name: Position /etc/mongod.conf and mongodb.service
+- name: Populate & position /etc/mongod.conf, /etc/systemd/system/mongodb.service
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
@@ -27,8 +27,8 @@
     group: root
     mode: 0644
   with_items:
-    - { src: 'mongodb.service' , dest: '/etc/systemd/system/' }
-    - { src: 'mongod.conf' , dest: '/etc/mongod.conf'}
+    - { src: 'mongodb.service.j2', dest: '/etc/systemd/system/mongodb.service' }
+    - { src: 'mongod.conf.j2', dest: "{{ mongodb_conf }}" }
 
 - name: Restart service if enabled
   service:
diff --git a/roles/mongodb/templates/mongod.conf b/roles/mongodb/templates/mongod.conf.j2
similarity index 99%
rename from roles/mongodb/templates/mongod.conf
rename to roles/mongodb/templates/mongod.conf.j2
index 478375a5e..f8b3f1497 100644
--- a/roles/mongodb/templates/mongod.conf
+++ b/roles/mongodb/templates/mongod.conf.j2
@@ -21,7 +21,7 @@ logpath = /var/log/mongodb/mongod.log
 # unixSocketPrefix = /var/run/mongodb
 
 # Directory for datafiles (defaults to /data/db/)
-dbpath = /library/dbdata/mongodb
+dbpath = {{ mongodb_db_path }}
 
 # Enable/Disable journaling (journaling is on by default for 64 bit)
 journal = true
@@ -234,4 +234,3 @@ smallfiles = true
 
 # Activate FIPS 140-2 mode at startup
 #sslFIPSMode = true
-
diff --git a/roles/mongodb/templates/mongodb.service b/roles/mongodb/templates/mongodb.service.j2
similarity index 57%
rename from roles/mongodb/templates/mongodb.service
rename to roles/mongodb/templates/mongodb.service.j2
index 40f4f573f..4407efddc 100644
--- a/roles/mongodb/templates/mongodb.service
+++ b/roles/mongodb/templates/mongodb.service.j2
@@ -6,7 +6,9 @@ After=syslog.target network.target
 Type=simple
 User=mongodb
 Group=mongodb
-ExecStart=/usr/bin/mongod -f /etc/mongod.conf
+ExecStartPre=/usr/bin/mongod --repair --dbpath {{ mongodb_db_path }}
+ExecStart=/usr/bin/mongod -f {{ mongodb_conf }}
+ExecStop=/usr/bin/killall mongod
  
 [Install]
 WantedBy=multi-user.target
diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml
index 8226ad1ff..7374ae31e 100644
--- a/roles/moodle/tasks/main.yml
+++ b/roles/moodle/tasks/main.yml
@@ -22,12 +22,12 @@
     - php{{ php_version }}-cli
   when: is_debuntu
 
-- name: php-zip name (debian_9 or ubuntu)
+- name: php-zip name (debian-9 or ubuntu)
   package:
     name: "php{{ php_version }}-zip"
   when: is_debian_9 or is_ubuntu
 
-- name: php-zip name for (debian_8)
+- name: php-zip name for (debian-8)
   package:
     name: php-pclzip
   when: is_debian_8
diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml
index 02f879cd1..3fad2b357 100644
--- a/roles/mysql/tasks/main.yml
+++ b/roles/mysql/tasks/main.yml
@@ -19,13 +19,13 @@
       tags:
         - download
 
-    - name: php-xml (ubuntu or debian_9)
+    - name: php-xml (ubuntu or debian-9)
       package:
         name: "php{{ php_version }}-xml"
         state: present
       when: is_ubuntu or is_debian_9
 
-    - name: php-xml (debian_8)
+    - name: php-xml (debian-8)
       package:
         name: "php-xml-parser"
         state: present