diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index b4fd1db..3a6414a 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -5,20 +5,20 @@
 # ---
 
 apt_ansible_dependencies:
-  - python
+  - apt-transport-https
+  - ca-certificates
+  - dbus
+  - lsb-release
+  - mc
+  - net-tools
+  - openssl
+  - python-apt-common
   - python3
   - python3-apt
-  - lsb-release
-  - apt-transport-https
-  - dbus
+  - software-properties-common
   - sudo
   - vim
-  - net-tools
   - vlan
-  - ca-certificates
-  - openssl
-  - mc
-  - software-properties-common
 
 
 # ---
diff --git a/roles/ansible_dependencies-bullseye/tasks/main.yml b/roles/ansible_dependencies-bullseye/tasks/main.yml
index d24c914..2e522a8 100644
--- a/roles/ansible_dependencies-bullseye/tasks/main.yml
+++ b/roles/ansible_dependencies-bullseye/tasks/main.yml
@@ -7,7 +7,7 @@
   raw: test -e /usr/bin/aptitude || apt-get install aptitude -y
 
 - name: Ensure python2 is present (This is necessary for ansible to work properly)
-  raw: test -e /usr/bin/python2 || (apt -y update && apt install -y python)
+  raw: test -e /usr/bin/python2 || (apt -y update && apt install -y python-is-python2)
 
 - name: Ensure python3 is present (This is necessary for ansible to work properly)
   raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3)
diff --git a/roles/common/tasks/apt.yml b/roles/common/tasks/apt.yml
index cd4aeba..44920f8 100644
--- a/roles/common/tasks/apt.yml
+++ b/roles/common/tasks/apt.yml
@@ -59,6 +59,7 @@
     name: "{{ apt_initial_install_stretch }}"
     state: "{{ apt_install_state }}"
   when:
+    - - apt_initial_install_stretch is defined and apt_initial_install_stretch|length > 0
     - ansible_facts['distribution'] == "Debian"
     - ansible_facts['distribution_major_version'] == "9"
   tags:
@@ -69,6 +70,7 @@
     name: "{{ apt_initial_install_buster }}"
     state: "{{ apt_install_state }}"
   when:
+    - apt_initial_install_buster is defined and apt_initial_install_buster|length > 0
     - ansible_facts['distribution'] == "Debian"
     - ansible_facts['distribution_major_version'] == "10"
   tags:
@@ -79,6 +81,7 @@
     name: "{{ apt_initial_install_bullseye }}"
     state: "{{ apt_install_state }}"
   when:
+    - apt_initial_install_bullseye is defined and apt_initial_install_bullseye|length > 0
     - ansible_facts['distribution'] == "Debian"
     - ansible_facts['distribution_major_version'] == "11"
   tags: