diff --git a/devops.tf b/devops.tf
index a314392..b37f678 100644
--- a/devops.tf
+++ b/devops.tf
@@ -138,7 +138,7 @@ resource "oci_devops_build_pipeline_stage" "repo_build_pipeline_stage" {
   image = var.devops_pipeline_image
   is_pass_all_parameters_enabled = false
   primary_build_source = oci_devops_repository.config_repo[0].name
-  stage_execution_timeout_in_seconds = 300
+  stage_execution_timeout_in_seconds = 600
   count = local.use-repository ? 1 : 0
 }
 
@@ -173,7 +173,7 @@ resource "oci_devops_build_pipeline_stage" "art_build_pipeline_stage" {
   image = var.devops_pipeline_image
   is_pass_all_parameters_enabled = false
   primary_build_source = oci_devops_repository.config_repo[0].name
-  stage_execution_timeout_in_seconds = 300
+  stage_execution_timeout_in_seconds = 600
   count = local.use-artifact ? 1 : 0
 }
 
diff --git a/java/Dockerfile-jar.template b/java/Dockerfile-jar.template
index 130244b..4ff9277 100644
--- a/java/Dockerfile-jar.template
+++ b/java/Dockerfile-jar.template
@@ -2,14 +2,26 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 # dockerfile for running the application from JAR 
-FROM container-registry.oracle.com/java/jdk-no-fee-term:17
+FROM container-registry.oracle.com/java/jdk-no-fee-term:23-oraclelinux9
 
 RUN useradd -U -d /home/appuser appuser && \
   mkdir /opt/app && \
+  mkdir /opt/app/lib && \
   mkdir /opt/apm && \
   mkdir /opt/apm-agent && \
   chown appuser:appuser /opt/app /opt/apm /opt/apm-agent 
 
+# Download the Oracle JDBC TCP Fast Open (TFO) Library File
+WORKDIR /opt/app/lib
+RUN dnf install wget
+RUN curl https://oss.oracle.com/el4/unzip/unzip.tar -o unzip.tar
+RUN wget https://download.oracle.com/otn-pub/otn_software/jdbc/tfo-lib/v1/libtfojdbc1.so_aarch64.zip
+RUN tar -xf unzip.tar
+RUN ./unzip libtfojdbc1.so_aarch64.zip
+
+ENV LD_PRELOAD=/opt/app/lib/libtfojdbc1.so
+ENV LD_LIBRARY_PATH=extracted_binaries_path:/usr/java/jdk-23/lib;
+
 USER appuser
 WORKDIR /home/appuser
 # COPY --chown=appuser:appuser .oci .
diff --git a/java/build-artifact.yaml.template b/java/build-artifact.yaml.template
index dc25aff..904709b 100644
--- a/java/build-artifact.yaml.template
+++ b/java/build-artifact.yaml.template
@@ -36,7 +36,7 @@ steps:
       sh add-credential-wallet.sh
   - type: Command
     name: Build Docker image
-    timeoutInSeconds: 600
+    timeoutInSeconds: 900
     failImmediatelyOnError: true
     command: |
       docker build . --file Dockerfile --tag ${image_remote_tag}:${image_tag}-$${artifact_version} --tag ${image_latest_tag}
diff --git a/java/build-repo.yaml.template b/java/build-repo.yaml.template
index e73c542..eabbd37 100644
--- a/java/build-repo.yaml.template
+++ b/java/build-repo.yaml.template
@@ -76,7 +76,7 @@ steps:
       cp $${OCI_WORKSPACE_DIR}/${repo_name}/${artifact_location} ./${fileName}
   - type: Command
     name: Build Docker image
-    timeoutInSeconds: 600
+    timeoutInSeconds: 900
     failImmediatelyOnError: true
     command: |
       cd $${OCI_WORKSPACE_DIR}/${repo_name}