diff --git a/extra/java-openjdk/PKGBUILD b/extra/java-openjdk/PKGBUILD
index 66d92ea51..fe7ee15e9 100644
--- a/extra/java-openjdk/PKGBUILD
+++ b/extra/java-openjdk/PKGBUILD
@@ -22,15 +22,17 @@
 
 pkgbase=java-openjdk
 pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src')
-_majorver=17
+_majorver=18
 _minorver=0
-_securityver=3
-_updatever=3
-pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
+_securityver=0
+_updatever=0
+# pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
 #pkgver=${_majorver}.u${_updatever}
-pkgrel=1
-_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
+pkgver=${_majorver}
+pkgrel=2
+# _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
 #_git_tag=jdk-${_majorver}+${_updatever}
+_git_tag=jdk-${_majorver}-ga
 arch=('x86_64')
 url='https://openjdk.java.net/'
 license=('custom')
@@ -43,10 +45,10 @@ source=(https://github.com/openjdk/jdk${_majorver}u/archive/${_git_tag}.tar.gz
         freedesktop-java.desktop
         freedesktop-jconsole.desktop
         freedesktop-jshell.desktop)
-sha256sums=('f985bc954c50b9c09d1f8fab698b6591cc46ce3ef6a18570aa192567ff661ca0'
-            '85c4742764590783160af74587a47269e6797fbdf17ec485c7644bd239adf61d'
-            'abac1ab09a33a3654378bc69be5a7cf075263ab3ae9efec1eb25cf388e711bb7'
-            'e7cce0ecf868f656d8dc2eb25ab82ab665526a0a28aba20f02632dd29962dac3')
+sha256sums=('d01149413acd484e9c098919d6e092a514a90cab45831e3832791556900c5b28'
+            '58bf779332d21151ba47719926ddcc8811ac7bbf414222141dcf40ac54cfaa2d'
+            '3a50ded3918024de4e441a46744c8e342faf46441b53c8bac7d589055a28a13c'
+            '2cace78ec911f73578991370914753c5b6abe9f7304bcbcb7a3077b8dbc7c867')
 
 case "${CARCH}" in
   x86_64) _JARCH='x86_64';;
diff --git a/extra/java-openjdk/freedesktop-java.desktop b/extra/java-openjdk/freedesktop-java.desktop
index c1b0110f1..dfb848257 100644
--- a/extra/java-openjdk/freedesktop-java.desktop
+++ b/extra/java-openjdk/freedesktop-java.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Name=OpenJDK Java 17 Runtime
-Name[fi]=OpenJDK Java 17 - ajonaikainen ympäristö
-Comment=OpenJDK Java 17 Runtime
-Comment[fi]=OpenJDK Java 17 - ajonaikainen ympäristö
+Name=OpenJDK Java 18 Runtime
+Name[fi]=OpenJDK Java 18 - ajonaikainen ympäristö
+Comment=OpenJDK Java 18 Runtime
+Comment[fi]=OpenJDK Java 18 - ajonaikainen ympäristö
 Keywords=java;runtime
-Exec=/usr/lib/jvm/java-17-openjdk/bin/java -jar
+Exec=/usr/lib/jvm/java-18-openjdk/bin/java -jar
 Terminal=false
 Type=Application
-Icon=java17-openjdk
+Icon=java18-openjdk
 MimeType=application/x-java-archive;application/java-archive;application/x-jar;
 NoDisplay=true
diff --git a/extra/java-openjdk/freedesktop-jconsole.desktop b/extra/java-openjdk/freedesktop-jconsole.desktop
index c7a1469f1..44fb3b44b 100644
--- a/extra/java-openjdk/freedesktop-jconsole.desktop
+++ b/extra/java-openjdk/freedesktop-jconsole.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
-Name=OpenJDK Java 17 Console
-Name[fi]=OpenJDK Java 17 - konsoli
-Comment=OpenJDK Java 17 Monitoring & Management Console
-Comment[fi]=OpenJDK Java 17 - valvonta- ja hallintakonsoli
+Name=OpenJDK Java 18 Console
+Name[fi]=OpenJDK Java 18 - konsoli
+Comment=OpenJDK Java 18 Monitoring & Management Console
+Comment[fi]=OpenJDK Java 18 - valvonta- ja hallintakonsoli
 Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-17-openjdk/bin/jconsole
+Exec=/usr/lib/jvm/java-18-openjdk/bin/jconsole
 Terminal=false
 Type=Application
-Icon=java17-openjdk
+Icon=java18-openjdk
 Categories=Application;System;
diff --git a/extra/java-openjdk/freedesktop-jshell.desktop b/extra/java-openjdk/freedesktop-jshell.desktop
index f02b1c2f2..d513704e9 100644
--- a/extra/java-openjdk/freedesktop-jshell.desktop
+++ b/extra/java-openjdk/freedesktop-jshell.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=OpenJDK Java 17 Shell
-Comment=OpenJDK Java 17 Shell
+Name=OpenJDK Java 18 Shell
+Comment=OpenJDK Java 18 Shell
 Keywords=java;shell
-Exec=/usr/lib/jvm/java-17-openjdk/bin/jshell
+Exec=/usr/lib/jvm/java-18-openjdk/bin/jshell
 Terminal=true
 Type=Application
-Icon=java17-openjdk
+Icon=java18-openjdk
 Categories=Application;System;
diff --git a/extra/java-openjdk/install_jdk-openjdk.sh b/extra/java-openjdk/install_jdk-openjdk.sh
index 1669ae6c2..76300b9cb 100644
--- a/extra/java-openjdk/install_jdk-openjdk.sh
+++ b/extra/java-openjdk/install_jdk-openjdk.sh
@@ -1,4 +1,4 @@
-THIS_JDK='java-17-openjdk'
+THIS_JDK='java-18-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then
diff --git a/extra/java-openjdk/install_jre-openjdk-headless.sh b/extra/java-openjdk/install_jre-openjdk-headless.sh
index b7e65a5cc..cee45b4ff 100644
--- a/extra/java-openjdk/install_jre-openjdk-headless.sh
+++ b/extra/java-openjdk/install_jre-openjdk-headless.sh
@@ -1,4 +1,4 @@
-THIS_JRE='java-17-openjdk'
+THIS_JRE='java-18-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then
diff --git a/extra/java-openjdk/install_jre-openjdk.sh b/extra/java-openjdk/install_jre-openjdk.sh
index a6f0b401b..75a2eb12a 100644
--- a/extra/java-openjdk/install_jre-openjdk.sh
+++ b/extra/java-openjdk/install_jre-openjdk.sh
@@ -1,4 +1,4 @@
-THIS_JRE='java-17-openjdk'
+THIS_JRE='java-18-openjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then