diff --git a/molgenis10/roles/elasticsearch_7/tasks/main.yml b/molgenis10/roles/elasticsearch_7/tasks/main.yml
index 9cd7d51..cc275f4 100644
--- a/molgenis10/roles/elasticsearch_7/tasks/main.yml
+++ b/molgenis10/roles/elasticsearch_7/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: ElasticSearch Installation based on OS
-  include_tasks: "{{ ansible_os_family|lower }}.yml"
+  ansible.builtin.include_tasks: "{{ ansible_os_family | lower }}.yml"
 
 - name: Copy default configuration for Elasticsearch
   ansible.builtin.copy:
@@ -42,7 +42,7 @@
   notify: "restart elasticsearch"
 
 - name: Update /etc/security/limits.conf for nofile
-  pam_limits:
+  community.general.pam_limits:
     domain: elasticsearch
     limit_type: '-'
     limit_item: nofile
@@ -50,7 +50,7 @@
   notify: "restart elasticsearch"
 
 - name: Update /etc/security/limits.conf for nproc
-  pam_limits:
+  community.general.pam_limits:
     domain: elasticsearch
     limit_type: '-'
     limit_item: nproc
@@ -58,7 +58,7 @@
   notify: "restart elasticsearch"
 
 - name: Update sysctl.conf for Elasticsearch
-  sysctl:
+  ansible.posix.sysctl:
     name: vm.swappiness
     value: '1'
     state: present
diff --git a/molgenis10/roles/nginx/tasks/main.yml b/molgenis10/roles/nginx/tasks/main.yml
index b11b16f..558be8d 100644
--- a/molgenis10/roles/nginx/tasks/main.yml
+++ b/molgenis10/roles/nginx/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: NginX based on OS
-  include_tasks: "{{ ansible_os_family|lower }}.yml"
+  ansible.builtin.include_tasks: "{{ ansible_os_family | lower }}.yml"
 
 - name: Start and enable nginx (at boot time)
   ansible.builtin.systemd:
diff --git a/molgenis10/roles/nodejs/README.md b/molgenis10/roles/nodejs/README.md
new file mode 100644
index 0000000..50459db
--- /dev/null
+++ b/molgenis10/roles/nodejs/README.md
@@ -0,0 +1 @@
+The nodejs role configures the nodejs setup needed for molgenis frontends.
\ No newline at end of file
diff --git a/molgenis10/roles/postgres_11/tasks/main.yml b/molgenis10/roles/postgres_11/tasks/main.yml
index 73a79e4..9c4633d 100644
--- a/molgenis10/roles/postgres_11/tasks/main.yml
+++ b/molgenis10/roles/postgres_11/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Postgres-11 based on OS
-  include_tasks: "{{ ansible_os_family|lower }}.yml"
+  ansible.builtin.include_tasks: "{{ ansible_os_family | lower }}.yml"
 
 - name: Create 'molgenis'-user for PostgreSQL
   become: true
diff --git a/molgenis10/roles/postinstall/tasks/main.yml b/molgenis10/roles/postinstall/tasks/main.yml
index a153769..fc791e4 100644
--- a/molgenis10/roles/postinstall/tasks/main.yml
+++ b/molgenis10/roles/postinstall/tasks/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: Post-install based on OS
-  include_tasks: "{{ ansible_os_family|lower }}.yml"
+  ansible.builtin.include_tasks: "{{ ansible_os_family | lower }}.yml"
diff --git a/molgenis10/roles/preinstall/tasks/main.yml b/molgenis10/roles/preinstall/tasks/main.yml
index db614c2..f3bd490 100644
--- a/molgenis10/roles/preinstall/tasks/main.yml
+++ b/molgenis10/roles/preinstall/tasks/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: Pre-install based on OS
-  include_tasks: "{{ ansible_os_family|lower }}.yml"
+  ansible.builtin.include_tasks: "{{ ansible_os_family | lower }}.yml"
diff --git a/molgenis10/roles/tomcat/tasks/main.yml b/molgenis10/roles/tomcat/tasks/main.yml
index 1ce7c2c..c93f87c 100644
--- a/molgenis10/roles/tomcat/tasks/main.yml
+++ b/molgenis10/roles/tomcat/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Pre-install based on OS
-  include_tasks: "{{ ansible_os_family|lower }}.yml"
+  ansible.builtin.include_tasks: "{{ ansible_os_family | lower }}.yml"
 
 - name: Create molgenis group
   ansible.builtin.group: