diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..1e3bb1fc5dff512f05f42fc1b254ee269b927641
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "security_monitoring"]
+	path = security_monitoring
+	url = ../../agents/sma-playbook.git
+[submodule "performance_monitoring"]
+	path = performance_monitoring
+	url = ../../agents/pma-playbook.git
diff --git a/config.yaml b/config.yaml
index 83fbfa351bbd75d1a2e0c7d472f74ff16fe1b9d5..c1ab35fdabbb7734cb80de55c7450b9ec64fa5b1 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,7 +1,7 @@
 ---
 iac:
 - terraform
-- piacere_monitoring_requirements
-- piacere_monitoring
+- performance_monitoring
+- security_monitoring
 - nginx
 ...
\ No newline at end of file
diff --git a/performance_monitoring b/performance_monitoring
new file mode 160000
index 0000000000000000000000000000000000000000..76fb3507d97846509eafa3a3bcdbdf0d787dec41
--- /dev/null
+++ b/performance_monitoring
@@ -0,0 +1 @@
+Subproject commit 76fb3507d97846509eafa3a3bcdbdf0d787dec41
diff --git a/piacere_monitoring/ansible.cfg b/piacere_monitoring/ansible.cfg
deleted file mode 100644
index 885456a448024a41c76909e7d9e6b7eb972f2550..0000000000000000000000000000000000000000
--- a/piacere_monitoring/ansible.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# https://docs.ansible.com/ansible/latest/reference_appendices/config.html
-[defaults]
-host_key_checking = False
-deprecation_warnings=False ; to remove the python version depretation warning
-display_skipped_hosts = no 
\ No newline at end of file
diff --git a/piacere_monitoring/config.yaml b/piacere_monitoring/config.yaml
deleted file mode 100644
index a62bdc610c005dab45b1aaa18c0288fdae7ab4ac..0000000000000000000000000000000000000000
--- a/piacere_monitoring/config.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-
----
-input:
-  - instance_ip_vm1
-  - instance_server_private_key_user1
-  - DEPLOYMENT_ID
-output: []
-engine: ansible
-...
diff --git a/piacere_monitoring/inventory.j2 b/piacere_monitoring/inventory.j2
deleted file mode 100644
index fda17b36f330a491a1fd872a13c5eed702e1b122..0000000000000000000000000000000000000000
--- a/piacere_monitoring/inventory.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-[servers_for_piacere_monitoring]
-{{ instance_ip_vm1 }}
-
-[servers_for_piacere_monitoring:vars]
-ansible_connection=ssh
-ansible_user=ubuntu
-ansible_ssh_private_key_file=ssh_key
diff --git a/piacere_monitoring/main.yml b/piacere_monitoring/main.yml
deleted file mode 100644
index 9e047c50949e49e28371af5875f5383f6131fc5e..0000000000000000000000000000000000000000
--- a/piacere_monitoring/main.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-- hosts: all
-  pre_tasks:
-    - name: Check parameters
-      fail:
-        msg: 'variable {{item}} empty'
-      when:  item | length == 0
-      with_items:
-        - "{{ pma_deployment_id }}"
-        - "{{ pma_influxdb_bucket }}"
-        - "{{ pma_influxdb_token }}"
-        - "{{ pma_influxdb_org }}"
-        - "{{ pma_influxdb_addr }}"
-    - name: Print parameters
-      debug:
-        msg: 
-          - "pma_deployment_id: {{ pma_deployment_id }}"
-          - "pma_influxdb_bucket: {{ pma_influxdb_bucket }}"
-          - "pma_influxdb_token: {{ pma_influxdb_token }}"
-          - "pma_influxdb_org: {{ pma_influxdb_org }}"
-          - "pma_influxdb_addr: {{ pma_influxdb_addr | length }}"
-    - name: Ensure gnupg package
-      package:
-        name: gnupg
-        state: present
-      become: true
-
-  vars_files:
-    - vars/main.yaml
-  roles:
-    - dj-wasabi.telegraf
diff --git a/piacere_monitoring/site_requirements.yaml b/piacere_monitoring/site_requirements.yaml
deleted file mode 100644
index 3e7665dce4e17365bfd08f90425e9408d0f83045..0000000000000000000000000000000000000000
--- a/piacere_monitoring/site_requirements.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-- hosts: localhost
-  tasks:
-    - name: print disclamer
-      debug:
-        msg: this can also be done with "ansible-galaxy install -r requirements"
-    - name: install telegraf from galaxy
-      community.general.ansible_galaxy_install:
-        type: role
-        requirements_file: ansible_requirements.yml
diff --git a/piacere_monitoring/ssh_key.j2 b/piacere_monitoring/ssh_key.j2
deleted file mode 100644
index 1431f67c8cbc40dbb900c7a07be086c54ae196fe..0000000000000000000000000000000000000000
--- a/piacere_monitoring/ssh_key.j2
+++ /dev/null
@@ -1 +0,0 @@
-{{ instance_server_private_key_user1 }}
diff --git a/piacere_monitoring/vars/main.yaml b/piacere_monitoring/vars/main.yaml
deleted file mode 100644
index 82a13779b3fe5172fec598227652ac217a3583e5..0000000000000000000000000000000000000000
--- a/piacere_monitoring/vars/main.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-pma_deployment_id: "{{ lookup('env', 'DEPLOYMENT_ID' ) }}" 
-pma_influxdb_bucket:  "{{ lookup('env', 'INFLUXDB_BUCKET' ) }}"
-pma_influxdb_token:  "{{ lookup('env', 'INFLUXDB_TOKEN' ) }}"
-pma_influxdb_org:  "{{ lookup('env', 'INFLUXDB_ORG' ) }}"
-pma_influxdb_addr:  "{{ lookup('env', 'INFLUXDB_ADDR' ) }}"
-
-telegraf_agent_package_state: latest
-
-telegraf_agent_output:
-  - type: influxdb_v2
-    config:
-      - urls = ["{{ pma_influxdb_addr }}"]
-      - token = "{{ pma_influxdb_token }}"
-      - organization = "{{ pma_influxdb_org }}"
-      - bucket = "{{ pma_influxdb_bucket }}"
-      - insecure_skip_verify = true
-
-telegraf_global_tags:
-  - tag_name: deployment_id
-    tag_value: "{{ pma_deployment_id }}"
-
-telegraf_plugins_default:
-  - plugin: cpu
-  - plugin: mem
-  - plugin: processes
-  - plugin: disk
-  - plugin: net
\ No newline at end of file
diff --git a/piacere_monitoring_requirements/ansible.cfg b/piacere_monitoring_requirements/ansible.cfg
deleted file mode 100644
index 885456a448024a41c76909e7d9e6b7eb972f2550..0000000000000000000000000000000000000000
--- a/piacere_monitoring_requirements/ansible.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# https://docs.ansible.com/ansible/latest/reference_appendices/config.html
-[defaults]
-host_key_checking = False
-deprecation_warnings=False ; to remove the python version depretation warning
-display_skipped_hosts = no 
\ No newline at end of file
diff --git a/piacere_monitoring_requirements/ansible_requirements.yml b/piacere_monitoring_requirements/ansible_requirements.yml
deleted file mode 100644
index 58c0cb368b76e9a0313aee87b2296e727877b2d9..0000000000000000000000000000000000000000
--- a/piacere_monitoring_requirements/ansible_requirements.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-roles:
-#  - name: dj-wasabi.telegraf
-#    version: 0.13.2
-#    source: https://galaxy.ansible.com
-  - name: dj-wasabi.telegraf
-    src: https://github.com/dj-wasabi/ansible-telegraf.git
-    scm: git
-    version: 0.13.2
diff --git a/piacere_monitoring_requirements/config.yaml b/piacere_monitoring_requirements/config.yaml
deleted file mode 100644
index 8ddae8c719b4485a650b1686773214608e92ab66..0000000000000000000000000000000000000000
--- a/piacere_monitoring_requirements/config.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-
----
-input: []
-output: []
-engine: ansible
-...
diff --git a/piacere_monitoring_requirements/inventory.j2 b/piacere_monitoring_requirements/inventory.j2
deleted file mode 100644
index 05614f63f4308c6f6753e0ee14febd9a41497bbb..0000000000000000000000000000000000000000
--- a/piacere_monitoring_requirements/inventory.j2
+++ /dev/null
@@ -1 +0,0 @@
-localhost ansible_connection=local
\ No newline at end of file
diff --git a/piacere_monitoring_requirements/main.yml b/piacere_monitoring_requirements/main.yml
deleted file mode 100644
index 734e9e982ab1a6a619f37d64089b72c2a0631b31..0000000000000000000000000000000000000000
--- a/piacere_monitoring_requirements/main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- name: "Intalling requirements"
-  hosts: localhost
-  connection: local 
-  tasks:
-    - name: print disclamer
-      debug:
-        msg: this can also be done with "ansible-galaxy install -r requirements"
-    - name: install telegraf from galaxy
-      community.general.ansible_galaxy_install:
-        type: role
-        requirements_file: ansible_requirements.yml
diff --git a/piacere_monitoring_requirements/ssh_key.j2 b/piacere_monitoring_requirements/ssh_key.j2
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/security_monitoring b/security_monitoring
new file mode 160000
index 0000000000000000000000000000000000000000..b7b77584b5b22de27d6b5c59a71f67c7023f5099
--- /dev/null
+++ b/security_monitoring
@@ -0,0 +1 @@
+Subproject commit b7b77584b5b22de27d6b5c59a71f67c7023f5099