diff --git a/tasks/workstation/linux/software/android.yml b/tasks/workstation/linux/software/android.yml
index 6f28cff..d881d71 100644
--- a/tasks/workstation/linux/software/android.yml
+++ b/tasks/workstation/linux/software/android.yml
@@ -253,11 +253,17 @@
   shell: |
     if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
       yes | {{ android_sdkmanager2_install }} '{{ item }}'
-      echo "INSTALLED"
+
+      if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
+        echo "INSTALLED"
+      else
+        echo "FAILED"
+      fi
     fi
   loop: "{{ android_downloads_required }}"
   register: install_required
   changed_when: "'INSTALLED' in install_required.stdout"
+  failed_when: "'FAILED' in install_required.stdout"
   become_user: "{{ user }}"
   when: coding == true
 
@@ -266,11 +272,17 @@
   shell: |
     if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
       yes | {{ android_sdkmanager2_install }} '{{ item }}'
-      echo "INSTALLED"
+
+      if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
+        echo "INSTALLED"
+      else
+        echo "FAILED"
+      fi
     fi
   loop: "{{ android_downloads_additional }}"
   register: install_additional
   changed_when: "'INSTALLED' in install_additional.stdout"
+  failed_when: "'FAILED' in install_additional.stdout"
   become_user: "{{ user }}"
   when: coding == true
     and sdks == true
@@ -280,11 +292,17 @@
   shell: |
     if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
       yes | {{ android_sdkmanager2_remove }} '{{ item }}'
-      echo "REMOVED"
+
+      if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
+        echo "REMOVED"
+      else
+        echo "FAILED"
+      fi
     fi
   loop: "{{ android_downloads_additional }}"
   register: remove_additional
   changed_when: "'REMOVED' in remove_additional.stdout"
+  failed_when: "'FAILED' in remove_additional.stdout"
   become_user: "{{ user }}"
   when: coding != true
      or sdks != true
@@ -294,11 +312,17 @@
   shell: |
     if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
       yes | {{ android_sdkmanager2_remove }} '{{ item }}'
-      echo "REMOVED"
+
+      if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
+        echo "REMOVED"
+      else
+        echo "FAILED"
+      fi
     fi
   loop: "{{ android_downloads_unused }}"
   register: remove_unused
   changed_when: "'REMOVED' in remove_unused.stdout"
+  failed_when: "'FAILED' in remove_unused.stdout"
   become_user: "{{ user }}"
   when: coding == true