diff --git a/.forgejo/workflows/build_and_release.yml b/.forgejo/workflows/build_and_release.yml
index 7e1d4f3..0442526 100644
--- a/.forgejo/workflows/build_and_release.yml
+++ b/.forgejo/workflows/build_and_release.yml
@@ -7,7 +7,6 @@ on:
 
 env:
   REGISTRY: git.dc09.ru  # Change to your registry (e.g., forgejo.example.com)
-  ORGANIZATION: nm17  # Docker Hub organization or Forgejo username
   GITHUB_TOKEN: ${{ secrets.FORGEJO_PASSWORD }}
   GITHUB_API_URL: https://git.dc09.ru
   GITHUB_BASE_REF: git.dc09.ru
@@ -47,19 +46,10 @@ jobs:
       - name: Extract metadata (tags, labels)
         id: meta
         uses: docker/metadata-action@v5
-        env:
-          REGISTRY: git.dc09.ru  # Change to your registry (e.g., forgejo.example.com)
-          ORGANIZATION: nm17  # Docker Hub organization or Forgejo username
-          GITHUB_TOKEN: ${{ secrets.FORGEJO_PASSWORD }}
-          GITHUB_BASE_REF: git.dc09.ru
-          GITHUB_SERVER_URL: https://git.dc09.ru
-          DOCKERHUB_TOKEN: ${{ secrets.FORGEJO_PASSWORD }}
-          DOCKER_TOKEN: ${{ secrets.FORGEJO_PASSWORD }}
-          FORGEJO_URL: https://git.dc09.ru
         with:
           context: git
           images: |
-            git.dc09.ru/${{ env.ORGANIZATION }}/${{ matrix.images.image_name }}
+            git.dc09.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/${{ matrix.images.image_name }}
           tags: |
             type=ref,event=branch
             type=ref,event=pr
diff --git a/Dockerfile.openj9 b/Dockerfile.openj9
index e88a833..f4907c3 100644
--- a/Dockerfile.openj9
+++ b/Dockerfile.openj9
@@ -5,7 +5,7 @@ FROM ubuntu:25.04 AS build
 RUN apt update \
  && apt upgrade -y \
  && apt install -qq -y --no-install-recommends \
-      ant ant-contrib autoconf build-essential ca-certificates cmake cpio curl file g++-14 gcc-14 gdb git \
+      ant ant-contrib autoconf build-essential ca-certificates cmake cpio curl file clang-19 gdb git \
       libasound2-dev libcups2-dev libdwarf-dev libelf-dev libexpat1-dev libffi-dev libfontconfig libfontconfig1-dev \
       libfreetype6-dev libnuma-dev libssl-dev libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev libxtst-dev \
       make nasm pkg-config python3 python3-dev rsync systemtap-sdt-dev unzip wget xvfb zip zlib1g-dev \
@@ -25,7 +25,7 @@ RUN git clone --single-branch --depth 1 \
 WORKDIR /build/src
 RUN bash get_source.sh
 RUN bash configure --with-boot-jdk=/build/bootjdk --with-openssl=system
-RUN make all
+RUN make all -j$(nproc)
 
 # jlink by advice from https://adoptium.net/blog/2021/10/jlink-to-produce-own-runtime/
 WORKDIR /build/src/build/linux-x86_64-server-release/images