diff --git a/defaults/main.yml b/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..157c64204a707dc79d509b10620a00779a13c207
--- /dev/null
+++ b/defaults/main.yml
@@ -0,0 +1,22 @@
+default_repos:
+  debian:
+    bullseye:
+      debian:
+        url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }} main contrib non-free"
+      update:
+        url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-updates main contrib non-free"
+      security:
+        url: "deb https://security.debian.org/debian-security {{ ansible_distribution_release|lower }}-security main contrib non-free"
+      backports:
+        url: "deb https://deb.debian.org/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main"
+    buster:
+      debian:
+        url: "deb http://deb.debian.org/debian {{ ansible_distribution_release|lower }} main contrib non-free"
+      update:
+        url: "deb http://deb.debian.org/debian {{ ansible_distribution_release|lower }}-updates main contrib non-free"
+      security:
+        url: "deb http://deb.debian.org/debian-security/ {{ ansible_distribution_release|lower }}/updates main contrib non-free"
+      backports:
+        url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main"
+
+
diff --git a/vars/main.yml b/vars/main.yml
index 6d5edd3f96843561a6aa56c7eefc8436bfc6a3db..b84ed195a629ef11a240bcf81460ff9e69381560 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,4 +1,3 @@
-
 packages:
   pkg:
     aptitude: {}
@@ -21,7 +20,7 @@ packages:
     mksh: {}
     "molly-guard": {}
     mosh: {}
-    mtr: {}
+    "mtr-tiny": {}
     ncdu: {}
     "ncurses-term": {}
     "net-tools": {}
@@ -42,12 +41,4 @@ packages:
     vnstat: {}
     "xz-utils": {}
     zsh: {}
-  repos:
-    update:
-      url: "deb http://deb.debian.org/debian {{ ansible_distribution_release|lower }}-updates main contrib non-free"
-    security:
-      url: "deb http://deb.debian.org/debian-security/ {{ ansible_distribution_release|lower }}/updates main contrib non-free"
-#    backports:
-#      url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main"
-#      url: "deb http://http.debian.net/{{ ansible_distribution|lower }} {{ ansible_distribution_release|lower }}-backports main"
-
+  repos: "{{ default_repos[ansible_distribution|lower][ansible_distribution_release|lower] }}"