diff --git a/constants.tf b/constants.tf
index f066ab5..706eb93 100644
--- a/constants.tf
+++ b/constants.tf
@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 variable "devops_pipeline_image" {
   type = string
-  default = "OL7_X86_64_STANDARD_10"
+  default = "OL8_X86_64_STANDARD_10"
 }
 
 variable "devops_deploy_shape" {
diff --git a/devops.tf b/devops.tf
index a314392..c550814 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 = 3000
   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 = 3000
   count = local.use-artifact ? 1 : 0
 }
 
diff --git a/java/build-repo.yaml.template b/java/build-repo.yaml.template
index e73c542..ff225fb 100644
--- a/java/build-repo.yaml.template
+++ b/java/build-repo.yaml.template
@@ -18,8 +18,8 @@ steps:
     timeoutInSeconds: 600
     failImmediatelyOnError: true
     command: |
-      yum --enablerepo=ol7_oci_included clean metadata
-      yum install -y jdk-17
+      dnf install -y jdk-24-headful --enablerepo=ol8_oci_included
+      export PATH=$JAVA_HOME/bin:$PATH
     onFailure:
       - type: Command
         command: |