diff --git a/actions/opensuse b/actions/opensuse
index 6152328..e323373 100644
--- a/actions/opensuse
+++ b/actions/opensuse
@@ -7,8 +7,13 @@ DESCRIPTION="The makers choice for sysadmins, developers and desktop users"
 CREDENTIALS="-"
 
 function releases_() {
-    #shellcheck disable=SC2046,SC2005
-    echo $(web_pipe "https://download.opensuse.org/distribution/leap/" | grep 'class="name"' | cut -d '/' -f2 | grep -v 42 | sort -r) aeon microos tumbleweed
+    # shellcheck disable=SC2046,SC2005
+    # Leap have 16.0 dir but no iso file nor iso dir there
+    if web_pipe "https://download.opensuse.org/distribution/leap/16.0/" | grep -q 'href="iso/"'; then
+        echo $(web_pipe "https://download.opensuse.org/distribution/leap/" | grep 'class="name"' | cut -d '/' -f2 | grep -v 42 | sort -r  | tail --lines +2) aeon microos tumbleweed
+    else
+        echo tumbleweed microos aeon 15.6 15.5 15.4 15.3 15.2 15.1 15.0
+    fi
 }
 
 function get_() {
diff --git a/public/opensuse b/public/opensuse
index 8d901cb..3ffbb55 100644
--- a/public/opensuse
+++ b/public/opensuse
@@ -7,12 +7,17 @@ HOMEPAGE="https://www.opensuse.org"
 CREDENTIALS="-"
 
 
-RELEASES="tumbleweed microos aeon 16.0 15.6 15.5 15.4 15.3 15.2 15.1 15.0"
+RELEASES="tumbleweed microos aeon 15.6 15.5 15.4 15.3 15.2 15.1 15.0"
 
 
 function releases_() {
-    #shellcheck disable=SC2046,SC2005
-    echo $(web_pipe "https://download.opensuse.org/distribution/leap/" | grep 'class="name"' | cut -d '/' -f2 | grep -v 42 | sort -r) aeon microos tumbleweed
+    # shellcheck disable=SC2046,SC2005
+    # Leap have 16.0 dir but no iso file nor iso dir there
+    if web_pipe "https://download.opensuse.org/distribution/leap/16.0/" | grep -q 'href="iso/"'; then
+        echo $(web_pipe "https://download.opensuse.org/distribution/leap/" | grep 'class="name"' | cut -d '/' -f2 | grep -v 42 | sort -r  | tail --lines +2) aeon microos tumbleweed
+    else
+        echo tumbleweed microos aeon 15.6 15.5 15.4 15.3 15.2 15.1 15.0
+    fi
 }
 
 function get_() {