diff --git a/defaults/main.yml b/defaults/main.yml
index aed0150..f3b9a74 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,20 +1,22 @@
 ---
 # defaults file for dnsmasq
 
-stubby_listen_addresses:
-  - 127.0.0.1
-  - 0::1
+stubby_listen_addresses: []
+# Example:
+#   - 127.0.0.1@53000
+#   - 0::1@53000
 
-stubby_upstream_recursive_servers:
-  - address_data: 2a0f:fc80::0
-    tls_port: 853
-    tls_auth_name: "dns0.eu"
-  - address_data: 2a0f:fc81::0
-    tls_port: 853
-    tls_auth_name: "dns0.eu"
-  - address_data: 193.110.81.0
-    tls_port: 853
-    tls_auth_name: "dns0.eu"
-  - address_data: 185.253.5.0
-    tls_port: 853
-    tls_auth_name: "dns0.eu"
+stubby_upstream_recursive_servers: []
+# Example:
+#   - address_data: 2a0f:fc80::9
+#     tls_port: 853
+#     tls_auth_name: "dns0.eu"
+#   - address_data: 2a0f:fc81::9
+#     tls_port: 853
+#     tls_auth_name: "dns0.eu"
+#   - address_data: 193.110.81.9
+#     tls_port: 853
+#     tls_auth_name: "dns0.eu"
+#   - address_data: 185.253.5.9
+#     tls_port: 853
+#     tls_auth_name: "dns0.eu"
diff --git a/handlers/main.yml b/handlers/main.yml
index 493d3fe..b9b821b 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,7 +1,14 @@
 ---
 # handlers file for stubby
 
-- name: Redémarrer stubby.service
+- name: Apply installation
+  ansible.builtin.command:
+    argv:
+      - /usr/bin/rpm-ostree
+      - apply-live
+  become: true
+
+- name: Restart stubby.service
   ansible.builtin.systemd:
     state: restarted
     name: stubby.service
diff --git a/meta/main.yml b/meta/main.yml
index 04dc1af..dfca88b 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -11,5 +11,8 @@ galaxy_info:
     - name: Debian
       versions:
         - all
+    - name: CoreOS
+      versions:
+        - 41
 
 dependencies: []
diff --git a/tasks/configuration.yml b/tasks/configuration.yml
new file mode 100644
index 0000000..f72e964
--- /dev/null
+++ b/tasks/configuration.yml
@@ -0,0 +1,9 @@
+---
+# tasks file for stubby
+
+- name: Configurer stubby
+  ansible.builtin.template:
+    src: stubby.yml.j2
+    dest: /etc/stubby/stubby.yml
+  become: true
+  notify: Restart stubby.service
diff --git a/tasks/installation-apt.yml b/tasks/installation-apt.yml
new file mode 100644
index 0000000..37a9ca9
--- /dev/null
+++ b/tasks/installation-apt.yml
@@ -0,0 +1,7 @@
+---
+# tasks file for stubby
+
+- name: Install stubby
+  ansible.builtin.apt:
+    name: stubby
+  become: true
diff --git a/tasks/installation-atomic_container.yml b/tasks/installation-atomic_container.yml
new file mode 100644
index 0000000..358e449
--- /dev/null
+++ b/tasks/installation-atomic_container.yml
@@ -0,0 +1,18 @@
+---
+# tasks file for borgmatic
+
+- name: Install stubby
+  ansible.builtin.command:
+    argv:
+      - /usr/bin/rpm-ostree
+      - install
+      - --allow-inactive
+      - --assumeyes
+      - --idempotent
+      - stubby
+    creates: /sysroot/ostree/repo/refs/heads/rpmostree/pkg/stubby
+  become: true
+  notify: Apply installation
+
+- name: Flush handlers
+  meta: flush_handlers
diff --git a/tasks/main.yml b/tasks/main.yml
index 68bdf6f..133e03f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,14 +1,10 @@
 ---
 # tasks file for stubby
 
-- name: Installer stubby
-  ansible.builtin.apt:
-    name: stubby
-  become: true
+- name: Include installation tasks
+  ansible.builtin.include_tasks:
+    file: installation-{{ ansible_facts['pkg_mgr'] }}.yml
 
-- name: Configurer stubby
-  ansible.builtin.template:
-    src: stubby.yml.j2
-    dest: /etc/stubby/stubby.yml
-  become: true
-  notify: Redémarrer stubby.service
+- name: Import configuration tasks
+  ansible.builtin.import_tasks:
+    file: configuration.yml