diff --git a/.forgejo/workflows/build_and_release.yml b/.forgejo/workflows/build_and_release.yml
index 0442526..695cf86 100644
--- a/.forgejo/workflows/build_and_release.yml
+++ b/.forgejo/workflows/build_and_release.yml
@@ -2,7 +2,7 @@ name: Docker Image CI
 
 on:
   push:
-    branches: ['main']
+    
   pull_request:
 
 env:
@@ -24,9 +24,11 @@ jobs:
           - dockerfile: 'Dockerfile.openj9'
             image_name: 'openj9'
             context: './'
+            build-args: ["WITH_JDK=false"]
           - dockerfile: 'Dockerfile.piped'
             image_name: 'piped'
             context: './'
+            build-args: []
           # Add more images as needed
 
     steps:
@@ -66,4 +68,5 @@ jobs:
           file: ${{ matrix.images.dockerfile }}
           push: ${{ github.event_name == 'push' }}
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: ${{ matrix.images.build-args }}
\ No newline at end of file
diff --git a/Dockerfile.openj9 b/Dockerfile.openj9
index ae66ec9..83989e4 100644
--- a/Dockerfile.openj9
+++ b/Dockerfile.openj9
@@ -33,7 +33,7 @@ RUN git clone --single-branch --depth 1 \
 WORKDIR /build/src
 RUN bash get_source.sh
 
-RUN bash configure --with-jtreg=/build/jtreg --with-boot-jdk=/build/bootjdk --with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack"
+RUN bash configure --enable-libffi-bundling --enable-ddr --enable-jitserver --enable-fallback-linker --with-jtreg=/build/jtreg --with-boot-jdk=/build/bootjdk --with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack"
 RUN make all JOBS=$(nproc)
 RUN make install
 
@@ -55,17 +55,28 @@ openj9.sharedclasses,openj9.zosconditionhandling
 ENV JAVA_HOME=/build/src/build/linux-x86_64-server-release/images/jre
 ENV PATH="$JAVA_HOME/bin:$JAVA_HOME/lib:$PATH"
 ENV TEST_JDK_HOME=/build/src/build/linux-x86_64-server-release/images/jdk
-ENV TEST_ROOT=/build/openj9-repo/test
+ENV TEST_ROOT=/build/src/openj9/test
 ENV DIAGNOSTICLEVEL=nodetails
+ENV NATIVE_TEST_LIBS=/build/src/build/linux-x86_64-server-release/images/test
 
-RUN git clone --depth=1 https://github.com/eclipse-openj9/openj9.git /build/openj9-repo
+# WORKDIR /build/src/openj9
+# RUN mkdir build \
+#      && cd build/ \
+#      && cmake -DBOOT_JDK=/build/bootjdk .. \
+#      && make all JOBS=$(nproc) \
+#      && make install
 
-RUN cd /build/openj9-repo/test \
-     && git clone https://github.com/adoptium/TKG.git \
-     && cd TKG \
-     && make compile -j$(nproc) \
-     && make _sanity.openjdk.regular -j$(nproc)
+RUN cd /build/src/openj9/test \
+     && git clone https://github.com/adoptium/TKG.git
 
+WORKDIR /build/src/openj9/test/TKG
+
+RUN make compile -j$(nproc)
+RUN make _sanity.functional.regular -j$(nproc)
+
+RUN ls /build/src/build/linux-x86_64-server-release/images
+RUN ls /build/src/build/linux-x86_64-server-release/images/jdk
+RUN ls /build/src/build/linux-x86_64-server-release/images/test
 
 WORKDIR /build/src/build/linux-x86_64-server-release/images
 RUN mv ./* /build/dist/