diff --git a/README.md b/README.md
index 09ebfd1..25e2be2 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Universal Media Server is a DLNA-compliant UPnP Media Server. It is capable of sharing video, audio and images between most modern devices.
 The program streams or transcodes many different media formats with little or no configuration. It is powered by FFmpeg, MediaInfo, OpenSubtitles, Crowdin, MEncoder, tsMuxeR, AviSynth, VLC and more, which combine to offer support for a wide range of media formats.
 
-**Shipped version:** 13.8.0~ynh1
+**Shipped version:** 13.8.0~ynh2
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index d95332d..595adc8 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 Universal Media Server est un serveur multimédia UPnP compatible DLNA. Il peut partager des vidéos, de l'audio et des images avec la pluparts des équipements modernes. 
 Le programme stream ou transcode de nombreux formats média différents avec peu ou pas de configuration. Il utilise par FFmpeg, MediaInfo, OpenSubtitles, Crowdin, MEncoder, tsMuxeR, AviSynth, VLC et d'autres, qui se combinent pour offrir une grande variété de formats.
 
-**Version incluse :** 13.8.0~ynh1
+**Version incluse :** 13.8.0~ynh2
 
 ## Captures d’écran
 
diff --git a/doc/PRE_UPGRADE.d/13.8.0~ynh2.md b/doc/PRE_UPGRADE.d/13.8.0~ynh2.md
new file mode 100644
index 0000000..5b796df
--- /dev/null
+++ b/doc/PRE_UPGRADE.d/13.8.0~ynh2.md
@@ -0,0 +1,2 @@
+Changelog:
+Fix: - Fix dependency issue with openjdk-17-jre for armhf and arm64 systems
\ No newline at end of file
diff --git a/manifest.toml b/manifest.toml
index 8901094..883517f 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Universal Media Server"
 description.en = "A DLNA, UPnP and HTTP(S) Media Server"
 description.fr = "Un Serveur Multimedia DLNA, UPnP et HTTP(S)"
 
-version = "13.8.0~ynh1"
+version = "13.8.0~ynh2"
 
 maintainers = ["Krakinou"]
 
@@ -91,3 +91,8 @@ ram.runtime = "350M"
 
     [resources.apt]
     packages = "mediainfo dcraw mencoder mplayer vlc"
+    packages_from_raw_bash = """
+        if [[ "$YNH_ARCH" == "armhf" ]] || [[ "$YNH_ARCH" == "arm64" ]]; then
+           echo openjdk-17-jre
+        fi
+    """
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 2f239f9..69c72c9 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,10 +3,7 @@
 #=================================================
 # COMMON VARIABLES
 #=================================================
-if [[ "$YNH_ARCH" == "armhf" ]] || [[ "$YNH_ARCH" == "arm64" ]]
-then
-    pkg_dependencies+=" openjdk-17-jre"
-fi
+
 #=================================================
 # PERSONAL HELPERS
 #=================================================
diff --git a/tests.toml b/tests.toml
index 17ee633..f596fdb 100644
--- a/tests.toml
+++ b/tests.toml
@@ -1,5 +1,4 @@
 test_format = 1.0
 
 [default]
-    test_upgrade_from.fb78609.name = "13.5.0~ynh1"
-    test_upgrade_from.8e8e839.name = "13.4.1~ynh1"
+    test_upgrade_from.10d20b6.name = "13.8.0~ynh1"