diff --git a/db/tasks/deploy-db.yml b/db/tasks/deploy-db.yml
deleted file mode 100644
index 51f9290..0000000
--- a/db/tasks/deploy-db.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# deploy db postgresql, liquibase and redis
-
-- name: git archive local
-  local_action:
-    module: git
-    repo: "https://{{ git_username | urlencode }}:{{ git_password | urlencode }}@git.valczeryba.ovh/v4l3n71n/covas-liquibase.git"
-    dest: "/home/valentin/src/"
-    archive: "/tmp/covas-liquibase.tar.gz"
-    force: yes
-    update: yes
-  run_once: True
-
-- name: Create directory
-  file: 
-    path: "/home/valentin/{{ item }}"
-    state: directory
-  with_items:
-    - db
-    - db/covas-liquibase
-
-- name: Extract covas liquibase
-  unarchive:
-    src: "/tmp/covas-liquibase.tar.gz"
-    dest: "/home/valentin/db/covas-liquibase"
-
-- name: Template env file
-  template:
-    src: env.j2
-    dest: /home/valentin/db/.env
-
-- name: Copy docker compose server file
-  copy:
-    src: docker-compose-server.yml
-    dest: /home/valentin/db/docker-compose.yml
\ No newline at end of file
diff --git a/db/tasks/main.yml b/db/tasks/main.yml
deleted file mode 100644
index e0b1230..0000000
--- a/db/tasks/main.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# tasks file for server
-
-
-
-# include task db
-
-- name: Deploy database postgresql and redis
-  ansible.builtin.import_tasks: deploy-db.yml
-  tags: ["create-db", "deploy-db"]
-
-- name: Start db postgresql and redis
-  ansible.builtin.import_tasks: start-db.yml
-  tags: ["deploy-db", "start-db"]
-
-
-- name: stop db postgresql and redis
-  ansible.builtin.import_tasks: stop-db.yml
-  tags: ["destroy-db", "stop-db"]
-
-- name: Remove db
-  ansible.builtin.import_tasks: remove-db.yml
-  tags: ["destroy-db"]
\ No newline at end of file
diff --git a/db/tasks/remove-db.yml b/db/tasks/remove-db.yml
deleted file mode 100644
index 050d293..0000000
--- a/db/tasks/remove-db.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# remove db 
-
-- name: Stopping existing service
-  community.docker.docker_compose:
-    project_src: /home/valentin/db
-    state: absent
-    remove_volumes: yes
-    remove_images: local
-  register: output
-
-- name: Debug output
-  debug:
-    var: output
-
-- name: Remove project covas db
-  file:
-    path: /home/valentin/db
-    state: absent
\ No newline at end of file
diff --git a/db/tasks/start-db.yml b/db/tasks/start-db.yml
deleted file mode 100644
index 35d679a..0000000
--- a/db/tasks/start-db.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# start services db
-
-- name: Stopping existing service
-  community.docker.docker_compose:
-    project_src: /home/valentin/db
-    state: absent
-
-- name: Starting service
-  community.docker.docker_compose:
-    project_src: /home/valentin/db
-  register: output
-
-- name: debug output
-  debug: 
-    var: output
-
-- name: Allow port postgresql 
-  ansible.builtin.iptables:
-    chain: INPUT
-    protocol: tcp
-    destination_port: 54321
-    jump: ACCEPT
-    state: present
-  vars:
-    ansible_become: yes
-    ansible_become_method: sudo
-    ansible_become_password: "{{ sudo_password }}"
-
-- name: Allow port redis 
-  ansible.builtin.iptables:
-    chain: INPUT
-    protocol: tcp
-    destination_port: 63791
-    jump: ACCEPT
-    state: present
-  vars:
-    ansible_become: yes
-    ansible_become_method: sudo
-    ansible_become_password: "{{ sudo_password }}"
\ No newline at end of file
diff --git a/db/tasks/stop-db.yml b/db/tasks/stop-db.yml
deleted file mode 100644
index 1598e73..0000000
--- a/db/tasks/stop-db.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-# stop services db and redis 
-
-- name: Disallow port postgresql 
-  ansible.builtin.iptables:
-    chain: INPUT
-    protocol: tcp
-    destination_port: 54321
-    jump: ACCEPT
-    state: absent
-  vars:
-    ansible_become: yes
-    ansible_become_method: sudo
-    ansible_become_password: "{{ sudo_password }}"
-
-- name: Disallow port redis 
-  ansible.builtin.iptables:
-    chain: INPUT
-    protocol: tcp
-    destination_port: 63791
-    jump: ACCEPT
-    state: absent
-  vars:
-    ansible_become: yes
-    ansible_become_method: sudo
-    ansible_become_password: "{{ sudo_password }}"
-
-- name: Stopping existing service
-  community.docker.docker_compose:
-    project_src: /home/valentin/db
-    state: present
-    stopped: yes
-  register: output
-
-
-- name: Debug output
-  debug:
-    var: output
diff --git a/inventory/group_vars/db b/inventory/group_vars/db
index a744227..c79181c 100644
--- a/inventory/group_vars/db
+++ b/inventory/group_vars/db
@@ -1 +1,16 @@
-postgres_db: toto
\ No newline at end of file
+postgres_db: toto
+
+project_src: "/home/valentin/db"
+project_name: "covas-liquibase"
+
+project_directory:
+  - "{{ project_src }}"
+  - "{{ project_src }}/{{ project_name }}"
+
+docker_compose_file: "docker-compose-db.yml"
+
+project_env: "env-db.j2"
+
+ports_tcp:
+  - 54321
+  - 63791
\ No newline at end of file
diff --git a/inventory/group_vars/registry b/inventory/group_vars/registry
new file mode 100644
index 0000000..95fd182
--- /dev/null
+++ b/inventory/group_vars/registry
@@ -0,0 +1,11 @@
+
+project_src: "/home/valentin/registry"
+
+project_directory:
+  - "{{ project_src }}"
+
+docker_compose_file: "docker-compose-registry.yml"
+
+
+ports_tcp:
+  - 5000
\ No newline at end of file
diff --git a/inventory/hosts b/inventory/hosts
index 3defa7f..c0331f8 100644
--- a/inventory/hosts
+++ b/inventory/hosts
@@ -11,6 +11,9 @@ db
 [nas]
 valentin-nas
 
+[registry:children]
+nas
+
 [nas_vault:children]
 nas
 
diff --git a/playbook.yml b/playbook.yml
index 00917df..91ed9ea 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -1,13 +1,8 @@
 ---
-- hosts: nas
+- hosts: registry db
   remote_user: valentin
   roles:
-    - registry
-  
-- hosts: db
-  remote_user: valentin
-  roles:
-    - db
+    - server
 
 - hosts: local
   remote_user: valentin
diff --git a/registry/.travis.yml b/registry/.travis.yml
deleted file mode 100644
index 36bbf62..0000000
--- a/registry/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-language: python
-python: "2.7"
-
-# Use the new container infrastructure
-sudo: false
-
-# Install ansible
-addons:
-  apt:
-    packages:
-    - python-pip
-
-install:
-  # Install ansible
-  - pip install ansible
-
-  # Check ansible version
-  - ansible --version
-
-  # Create ansible.cfg with correct roles_path
-  - printf '[defaults]\nroles_path=../' >ansible.cfg
-
-script:
-  # Basic role syntax check
-  - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
\ No newline at end of file
diff --git a/registry/README.md b/registry/README.md
deleted file mode 100644
index 225dd44..0000000
--- a/registry/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Role Name
-=========
-
-A brief description of the role goes here.
-
-Requirements
-------------
-
-Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
-
-Role Variables
---------------
-
-A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
-
-Dependencies
-------------
-
-A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
-
-Example Playbook
-----------------
-
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
-    - hosts: servers
-      roles:
-         - { role: username.rolename, x: 42 }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/registry/defaults/main.yml b/registry/defaults/main.yml
deleted file mode 100644
index 492c903..0000000
--- a/registry/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for server
diff --git a/registry/handlers/main.yml b/registry/handlers/main.yml
deleted file mode 100644
index e7b1089..0000000
--- a/registry/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for server
diff --git a/registry/meta/main.yml b/registry/meta/main.yml
deleted file mode 100644
index c572acc..0000000
--- a/registry/meta/main.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-galaxy_info:
-  author: your name
-  description: your role description
-  company: your company (optional)
-
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-
-  # Choose a valid license ID from https://spdx.org - some suggested licenses:
-  # - BSD-3-Clause (default)
-  # - MIT
-  # - GPL-2.0-or-later
-  # - GPL-3.0-only
-  # - Apache-2.0
-  # - CC-BY-4.0
-  license: license (GPL-2.0-or-later, MIT, etc)
-
-  min_ansible_version: 2.1
-
-  # If this a Container Enabled role, provide the minimum Ansible Container version.
-  # min_ansible_container_version:
-
-  #
-  # Provide a list of supported platforms, and for each platform a list of versions.
-  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
-  # To view available platforms and versions (or releases), visit:
-  # https://galaxy.ansible.com/api/v1/platforms/
-  #
-  # platforms:
-  # - name: Fedora
-  #   versions:
-  #   - all
-  #   - 25
-  # - name: SomePlatform
-  #   versions:
-  #   - all
-  #   - 1.0
-  #   - 7
-  #   - 99.99
-
-  galaxy_tags: []
-    # List tags for your role here, one per line. A tag is a keyword that describes
-    # and categorizes the role. Users find roles by searching for tags. Be sure to
-    # remove the '[]' above, if you add tags to this list.
-    #
-    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
-    #       Maximum 20 tags per role.
-
-dependencies: []
-  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
-  # if you add dependencies to this list.
diff --git a/registry/tasks/deploy-registry.yml b/registry/tasks/deploy-registry.yml
deleted file mode 100644
index 9cb0d66..0000000
--- a/registry/tasks/deploy-registry.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# deploy docker registry
-
-- name: Create directory
-  file: 
-    path: "/home/valentin/{{ item }}"
-    state: directory
-  with_items:
-    - registry
-
-- name: Copy docker compose server file
-  copy:
-    src: docker-compose-registry.yml
-    dest: /home/valentin/registry/docker-compose.yml
\ No newline at end of file
diff --git a/registry/tasks/main.yml b/registry/tasks/main.yml
deleted file mode 100644
index 62f1ed3..0000000
--- a/registry/tasks/main.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# tasks file for server
-
-
-
-# include task registry
-
-- name: Deploy registry
-  ansible.builtin.import_tasks: deploy-registry.yml
-  tags: ["create-registry", "deploy-registry"]
-
-- name: Start registry
-  ansible.builtin.import_tasks: start-registry.yml
-  tags: ["deploy-registry", "start-registry"]
-
-
-- name: stop registry
-  ansible.builtin.import_tasks: stop-registry.yml
-  tags: ["destroy-registry", "stop-registry"]
-
-- name: Remove registry
-  ansible.builtin.import_tasks: remove-registry.yml
-  tags: ["destroy-registry"]
\ No newline at end of file
diff --git a/registry/templates/env.j2 b/registry/templates/env.j2
deleted file mode 100644
index f90d46b..0000000
--- a/registry/templates/env.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-POSTGRES_PASSWORD={{ postgres_password }}
-POSTGRES_USER={{ postgres_user }}
-POSTGRES_DB={{ postgres_db }}
\ No newline at end of file
diff --git a/registry/vars/main.yml b/registry/vars/main.yml
deleted file mode 100644
index 1c4ee13..0000000
--- a/registry/vars/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-# vars file for server
-
-project_src: /home/valentin/registry
diff --git a/db/.travis.yml b/server/.travis.yml
similarity index 100%
rename from db/.travis.yml
rename to server/.travis.yml
diff --git a/db/README.md b/server/README.md
similarity index 100%
rename from db/README.md
rename to server/README.md
diff --git a/db/defaults/main.yml b/server/defaults/main.yml
similarity index 100%
rename from db/defaults/main.yml
rename to server/defaults/main.yml
diff --git a/db/files/docker-compose-server.yml b/server/files/docker-compose-db.yml
similarity index 100%
rename from db/files/docker-compose-server.yml
rename to server/files/docker-compose-db.yml
diff --git a/registry/files/docker-compose-registry.yml b/server/files/docker-compose-registry.yml
similarity index 100%
rename from registry/files/docker-compose-registry.yml
rename to server/files/docker-compose-registry.yml
diff --git a/db/handlers/main.yml b/server/handlers/main.yml
similarity index 100%
rename from db/handlers/main.yml
rename to server/handlers/main.yml
diff --git a/db/meta/main.yml b/server/meta/main.yml
similarity index 100%
rename from db/meta/main.yml
rename to server/meta/main.yml
diff --git a/server/tasks/deploy.yml b/server/tasks/deploy.yml
new file mode 100644
index 0000000..f2114f8
--- /dev/null
+++ b/server/tasks/deploy.yml
@@ -0,0 +1,35 @@
+# deploy db postgresql, liquibase and redis
+
+- name: git archive local
+  local_action:
+    module: git
+    repo: "https://{{ git_username | urlencode }}:{{ git_password | urlencode }}@git.valczeryba.ovh/v4l3n71n/{{ project_name }}.git"
+    dest: "/home/valentin/src/"
+    archive: "/tmp/{{ project_name }}.tar.gz"
+    force: yes
+    update: yes
+  when: "project_name is defined"
+
+- name: Create directory
+  file: 
+    path: "{{ item }}"
+    state: directory
+  with_items: "{{ project_directory }}"
+
+- name: Extract covas liquibase
+  unarchive:
+    src: "/tmp/{{ project_name }}.tar.gz"
+    dest: "{{ project_src }}/{{ project_name }}"
+  when: "project_name is defined"
+
+
+- name: Template env file
+  template:
+    src: "{{ project_env }}"
+    dest: "{{ project_src }}/.env"
+  when: "project_env is defined"
+
+- name: Copy docker compose server file
+  copy:
+    src: "{{ docker_compose_file }}"
+    dest: "{{ project_src }}/docker-compose.yml"
\ No newline at end of file
diff --git a/server/tasks/main.yml b/server/tasks/main.yml
new file mode 100644
index 0000000..c60758b
--- /dev/null
+++ b/server/tasks/main.yml
@@ -0,0 +1,19 @@
+---
+# tasks file for server
+
+- name: Deploy services
+  ansible.builtin.import_tasks: deploy.yml
+  tags: ["deploy", "create"]
+
+- name: Start services
+  ansible.builtin.import_tasks: start.yml
+  tags: ["deploy", "start"]
+
+
+- name: stop services
+  ansible.builtin.import_tasks: stop.yml
+  tags: ["destroy", "stop"]
+
+- name: Remove services
+  ansible.builtin.import_tasks: remove.yml
+  tags: ["destroy"]
\ No newline at end of file
diff --git a/registry/tasks/remove-registry.yml b/server/tasks/remove.yml
similarity index 90%
rename from registry/tasks/remove-registry.yml
rename to server/tasks/remove.yml
index b1d1fa5..9c6e9f3 100644
--- a/registry/tasks/remove-registry.yml
+++ b/server/tasks/remove.yml
@@ -12,7 +12,7 @@
   debug:
     var: output
 
-- name: Remove project covas db
+- name: Remove project 
   file:
     path: "{{ project_src }}"
     state: absent
\ No newline at end of file
diff --git a/registry/tasks/start-registry.yml b/server/tasks/start.yml
similarity index 83%
rename from registry/tasks/start-registry.yml
rename to server/tasks/start.yml
index 72b495c..dbc444c 100644
--- a/registry/tasks/start-registry.yml
+++ b/server/tasks/start.yml
@@ -14,14 +14,16 @@
   debug: 
     var: output
 
-- name: Allow port registry 
+- name: "Allow port {{ item }}"  
   ansible.builtin.iptables:
     chain: INPUT
     protocol: tcp
-    destination_port: 5000
+    destination_port: "{{ item }}"
     jump: ACCEPT
     state: present
   vars:
     ansible_become: yes
     ansible_become_method: sudo
     ansible_become_password: "{{ sudo_password }}"
+  with_items: "{{ ports_tcp }}"
+
diff --git a/registry/tasks/stop-registry.yml b/server/tasks/stop.yml
similarity index 81%
rename from registry/tasks/stop-registry.yml
rename to server/tasks/stop.yml
index a5cb2ab..d554335 100644
--- a/registry/tasks/stop-registry.yml
+++ b/server/tasks/stop.yml
@@ -1,16 +1,19 @@
 # stop services db and redis 
 
-- name: Disallow port postgresql 
+- name: Disallow port {{ item }} 
   ansible.builtin.iptables:
     chain: INPUT
     protocol: tcp
-    destination_port: 5000
+    destination_port: "{{ item }}"
     jump: ACCEPT
     state: absent
   vars:
     ansible_become: yes
     ansible_become_method: sudo
     ansible_become_password: "{{ sudo_password }}"
+  with_items: "{{ ports_tcp }}"
+
+
 
 - name: Stopping existing service
   community.docker.docker_compose:
diff --git a/db/templates/env.j2 b/server/templates/env-db.j2
similarity index 100%
rename from db/templates/env.j2
rename to server/templates/env-db.j2
diff --git a/db/vars/main.yml b/server/vars/main.yml
similarity index 100%
rename from db/vars/main.yml
rename to server/vars/main.yml