diff --git a/tasks/main.yml b/tasks/main.yml
index 9a12cfc2028750083ce26214d4bb6b610349f93c..ed8c063d7ce8edd1fee01bf3f10ba0f08560ab7f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,7 +2,6 @@
 - name: Include OS-specific variables.
   include_vars: "{{ ansible_os_family }}.yml"
 
-## Install Docker packages
 - name: Install apt-transport-https package
   apt:
     name: apt-transport-https
@@ -10,41 +9,6 @@
     state: latest
   when: ansible_os_family == "Debian"
 
-# TODO-PI update for getting proper packages for Raspbian - add packages libffi-dev libssl-dev
-- name: Add Docker GPG key to APT
-  get_url:
-    url: "https://download.docker.com/linux/{{ ansible_distribution|lower }}/gpg"
-    dest: /etc/apt/trusted.gpg.d/docker.asc
-    mode: '0644'
-  when: ansible_os_family == "Debian"
-
-- name: Add Docker repo to APT repositories for x86_64 architecture
-  apt_repository:
-    repo: deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution|lower }}/ {{ ansible_distribution_release|lower }} stable
-    update_cache: true
-  when: ansible_os_family == "Debian" and ansible_architecture == "x86_64"
-
-- name: Add Docker repo to APT repositories for ARM 64 architecture
-  apt_repository:
-    repo: deb [arch=arm64] https://download.docker.com/linux/{{ ansible_distribution|lower }}/ {{ ansible_distribution_release|lower }} stable
-    update_cache: true
-  when: ansible_os_family == "Debian" and ansible_architecture == "aarch64"
-
-- name: Add Docker repo to YUM repositories
-  yum_repository:
-    file: docker-ce
-    name: docker-ce-stable
-    description: Docker CE Stable - $basearch
-    baseurl: https://download.docker.com/linux/centos/7/$basearch/stable
-    gpgkey: https://download.docker.com/linux/centos/gpue
-    gpgcheck: true
-  when: ansible_os_family == "RedHat"
-
-- name: Remove old Docker packages if present
-  package:
-    name: "{{ packages_to_remove }}"
-    state: absent
-
 - name: Install OS packages
   package:
     name: "{{ packages_to_install }}"
@@ -59,13 +23,6 @@
     state: latest
   when: ansible_check_mode
 
-- name: Update pip
-  pip:
-    name: ['{{ item }}']
-    executable: pip3
-    state: latest
-  with_items: "{{ pip_packages }}"
-
 - name: Create /etc/docker repo
   file:
     name: /etc/docker
diff --git a/templates/inverseproxy.yaml.j2 b/templates/inverseproxy.yaml.j2
index 7dbb6bedaa060f47e0c474af9ac5eb19fea99655..1de8f0f27e39af51e4c2e3457a789926341fce55 100644
--- a/templates/inverseproxy.yaml.j2
+++ b/templates/inverseproxy.yaml.j2
@@ -7,7 +7,7 @@ services:
             TZ: "{{ timezone }}"
         networks:
             net46:
-{% if odoo_instances.values() | list | selectattr('extra_app', 'defined') %}
+{% if odoo_instances is defined and odoo_instances.values() | list | selectattr('extra_app', 'defined') %}
             app:
 {% endif %}
             shared:
@@ -30,7 +30,7 @@ services:
 {% endif %}
 {% endif %}
 {% endif %}
-{% if metabase %}
+{% if odoo_instances is defined and odoo_instances.values() | list | selectattr('metabase', 'defined') %}
             bi:
 {% endif %}
             smtp:
@@ -77,7 +77,7 @@ networks:
             config:
                - subnet: fd01::/64
                  gateway: fd01::1
-{% if odoo_instances.values() | list | selectattr('extra_app', 'defined') %}
+{% if odoo_instances is defined and odoo_instances.values() | list | selectattr('extra_app', 'defined') %}
     app:
         internal: true
         driver_opts:
@@ -89,7 +89,7 @@ networks:
 {% endif %}
         driver_opts:
             encrypted: 1
-{% if metabase %}
+{% if odoo_instances is defined and odoo_instances.values() | list | selectattr('metabase', 'defined') %}
     bi:
         internal: true
         driver_opts:
diff --git a/vars/Debian.yml b/vars/Debian.yml
index 1f4651c47b3c85480d7885c87b599113fbb95d44..31c2c6d71a63e4a698dc5278041f93ac5a46851e 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,15 +1,10 @@
 ---
-packages_to_remove:
-  - containerd
-  - docker
-  - docker-engine
-  - docker.io
-  - runc
 packages_to_install:
   - build-essential
   - ca-certificates
   - curl
-  - docker-ce
+  - docker.io
+  - docker-compose
   - git
   - python3-dev
   - python3-docker
diff --git a/vars/main.yml b/vars/main.yml
index e5dffd09b848305b43f03539d056d395d5a5443e..282afff333f4b6bae255f5f3f7f51a74cd3413bd 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,6 +1,3 @@
 ---
-pip_packages:
-  - pip
-  - docker_compose
 timezone: "Europe/Paris"
 traefik_version: "v2.10"