diff --git a/srcpkgs/SweetHome3D/template b/srcpkgs/SweetHome3D/template
index 7d1a29e7019..b5aa21599de 100644
--- a/srcpkgs/SweetHome3D/template
+++ b/srcpkgs/SweetHome3D/template
@@ -4,7 +4,7 @@ version=7.2
 revision=1
 archs="i686 x86_64"
 hostmakedepends="unzip which"
-makedepends="openjdk apache-ant"
+makedepends="openjdk8 apache-ant"
 depends="virtual?java-runtime shared-mime-info desktop-file-utils libXext libXrender"
 short_desc="Free architectural design application"
 maintainer="1is7ac3 <isaac.qa13@gmail.com>"
diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template
index b18bc792c82..0ef959125cb 100644
--- a/srcpkgs/electron19/template
+++ b/srcpkgs/electron19/template
@@ -9,7 +9,7 @@ create_wrksrc=yes
 build_wrksrc="src"
 hostmakedepends="$(vopt_if clang "clang lld") pkgconf perl gperf bison ninja nodejs hwids
  libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel
- pciutils-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel
+ pciutils-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk8 libxslt-devel
  opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel
  alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if sndio sndio-devel) jq python3.11"
diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template
index a9c865c19c9..7b4e28812f4 100644
--- a/srcpkgs/electron24/template
+++ b/srcpkgs/electron24/template
@@ -9,7 +9,7 @@ create_wrksrc=yes
 build_wrksrc="src"
 hostmakedepends="$(vopt_if clang "clang lld") pkgconf perl gperf bison ninja nodejs hwids
  libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel
- pciutils-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel
+ pciutils-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk8 libxslt-devel
  opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel
  alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if sndio sndio-devel) jq python3.11"
diff --git a/srcpkgs/helden-software/template b/srcpkgs/helden-software/template
index 75ede4498f9..f0cdbe00342 100644
--- a/srcpkgs/helden-software/template
+++ b/srcpkgs/helden-software/template
@@ -1,8 +1,8 @@
 # Template file for 'helden-software'
 pkgname=helden-software
 version=5.5.3
-revision=1
-depends="openjdk-jre"
+revision=2
+depends="virtual?java-runtime"
 short_desc="Character generator for the Pen&Paper RPG DSA"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="custom:Proprietary"
@@ -19,6 +19,7 @@ do_install() {
 
 	vbin usr/bin/helden-software
 
+	mv usr/lib/heldensoftware usr/lib/helden-software
 	vcopy usr/lib usr
 	vcopy usr/share/icons usr/share
 	vcopy usr/share/applications usr/share
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 59ae3858ad6..d4b7e3801de 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
  -DRSTUDIO_BOOST_SIGNALS_VERSION=2
  -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
  -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
-hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
+hostmakedepends="unzip pandoc openjdk8 apache-ant R qt5-qmake
  qt5-host-tools which nodejs"
 makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
  boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
diff --git a/srcpkgs/sugar/template b/srcpkgs/sugar/template
index 63173282300..42935adc488 100644
--- a/srcpkgs/sugar/template
+++ b/srcpkgs/sugar/template
@@ -5,7 +5,7 @@ revision=2
 build_wrksrc=bin
 build_style=gnu-makefile
 make_build_args="javac"
-hostmakedepends="unzip openjdk"
+hostmakedepends="unzip openjdk8"
 depends="virtual?java-runtime"
 short_desc="SAT-based Constraint Solver"
 maintainer="Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>"