diff --git a/ansible/inventories/externals.yml b/ansible/inventories/externals.yaml
similarity index 78%
rename from ansible/inventories/externals.yml
rename to ansible/inventories/externals.yaml
index 75abd62..3f7b083 100644
--- a/ansible/inventories/externals.yml
+++ b/ansible/inventories/externals.yaml
@@ -1,5 +1,9 @@
+---
 externals:
     children:
+      nextcloud:
+        hosts:
+          c-service.sse.cloud.isti.cnr.it
       rup_tests:
         hosts:
           liquid:
diff --git a/ansible/inventories/group_vars/wireguard_server/sifi.yaml b/ansible/inventories/group_vars/wireguard_server/sifi.yaml
index 9f6edae..906eaac 100644
--- a/ansible/inventories/group_vars/wireguard_server/sifi.yaml
+++ b/ansible/inventories/group_vars/wireguard_server/sifi.yaml
@@ -8,5 +8,5 @@ wg_server_address: 192.168.99.1/32
 
 wg_peers:  
   - name: fabio_test
-    publicKey: "dzODOKndtafZSf2GqvClFdxrpwyNJnZ/AsZkNl+ovEE="
+    publicKey: "byR/8T9AZK2t1cxDCLVzdLXsxcUPRXA06CnfI8gwQyY="
     allowedIP: "192.168.99.4/32"
\ No newline at end of file
diff --git a/ansible/inventories/sifi.yaml b/ansible/inventories/sifi.yaml
index 031ad4f..f79f6d6 100644
--- a/ansible/inventories/sifi.yaml
+++ b/ansible/inventories/sifi.yaml
@@ -10,7 +10,7 @@ sifi:
         # ansible_host: 10.20.30.111
     wireguard_server:
       hosts:
-        wireguarder.sifi.isti.cnr.it:
+        vpn-1.sse.cloud.isti.cnr.it:
         #  ansible_host: 146.48.108.13
     nameserver:
       hosts:
diff --git a/ansible/playbooks/nextcloud.yaml b/ansible/playbooks/nextcloud.yaml
index 8d0b34e..01b76e4 100644
--- a/ansible/playbooks/nextcloud.yaml
+++ b/ansible/playbooks/nextcloud.yaml
@@ -1,17 +1,8 @@
 ---
 - name: Install Nextcloud AIO Docker
-  hosts: all
+  hosts: nextcloud
   become: true
-  vars:
-    pip_install_packages:
-      - name: docker
-    docker_version: "=5:28.2.2-1~ubuntu.24.04~noble"
-    docker_users:
-      - fabio
-      - ansible
-
 
   roles: 
-    - geerlingguy.pip
     - geerlingguy.docker
-    # - nextcloud_aio
+    - nextcloud_aio
diff --git a/ansible/playbooks/roles/nextcloud_aio/defaults/main.yaml b/ansible/playbooks/roles/nextcloud_aio/defaults/main.yaml
new file mode 100644
index 0000000..cea8237
--- /dev/null
+++ b/ansible/playbooks/roles/nextcloud_aio/defaults/main.yaml
@@ -0,0 +1,4 @@
+nextcloud_docker_image_name: "ghcr.io/nextcloud-releases/all-in-one"
+nextcloud_docker_image_tag: latest
+nextcloud_docker_skip_domain_validation: "true"
+nextcloud_docker_mastercontainer_volume_dir: /usr/data/nextcloud_aio_mastercontainer
\ No newline at end of file
diff --git a/ansible/playbooks/roles/nextcloud_aio/meta/main.yml b/ansible/playbooks/roles/nextcloud_aio/meta/main.yml
deleted file mode 100644
index b456d40..0000000
--- a/ansible/playbooks/roles/nextcloud_aio/meta/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-dependencies:
-  - role: docker
\ No newline at end of file
diff --git a/ansible/playbooks/roles/nextcloud_aio/tasks/nextcloud_docker_aio.yaml b/ansible/playbooks/roles/nextcloud_aio/tasks/nextcloud_docker_aio.yaml
index 65a06bb..04b21d4 100644
--- a/ansible/playbooks/roles/nextcloud_aio/tasks/nextcloud_docker_aio.yaml
+++ b/ansible/playbooks/roles/nextcloud_aio/tasks/nextcloud_docker_aio.yaml
@@ -1,18 +1,31 @@
 ---
-- name: Create volumes 
-  debug:
-    msg:
-    - "TODO!!!"
+- name: Pull docker image
+  docker_image:
+    name: "{{ nextcloud_docker_image_name }}"
+    tag: "{{ nextcloud_docker_image_tag }}"
+    source: pull
 
-- name: Download compose file 
-  become: true
-  become_user: docker
-  ansible.builtin.git:
-    repo: "https://gitea-s2i2s.isti.cnr.it/sinibaldi/SSE-Lab"
-    dest: SSE-Lab
+- name: Create Master Container volume dir
+  file:
+    path: "{{ nextcloud_docker_mastercontainer_volume_dir }}"
+    state: directory
+    mode: "0766"
 
-- name: create and start docker compose services
-  become: true
-  become_user: docker
-  community.docker.docker_compose_v2:
-    project_src: ~/SSE-Lab/dockerized/nextcloud-aio/compose.yaml
+- name: Create container
+  docker_container:
+    name: nextcloud-aio-mastercontainer
+    image: "{{ nextcloud_docker_image_name }}"
+    ports:
+      - "8080:8080"
+      - "80:80"
+      - "8443:8443"
+    env:
+      APACHE_PORT: "443"
+      APACHE_IP_BINDING: "0.0.0.0"
+      APACHE_ADDITIONAL_NETWORK: ""
+      SKIP_DOMAIN_VALIDATION: "{{ nextcloud_docker_skip_domain_validation }}"
+    volumes:
+      - nextcloud_aio_mastercontainer:/mnt/docker-aio-config
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    restart_policy : "always"
+    init : true
\ No newline at end of file