diff --git a/Dockerfile b/Dockerfile
index 9a1ceee..16a57a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM gradle:8.4.0-jdk21 AS build
+FROM --platform=$BUILDPLATFORM gradle:8.5.0-jdk21 AS build
 ARG RELEASE_MODE
 ARG APP_VERSION
 WORKDIR /usr/app
@@ -10,7 +10,7 @@ RUN if [ "${RELEASE_MODE}" = true ]; then \
     else gradle build --exclude-task test -Dorg.gradle.project.version=${APP_VERSION}; fi
 
 # For ARM build use flag: `--platform linux/arm64`
-FROM --platform=$BUILDPLATFORM amazoncorretto:21.0.1
+FROM  amazoncorretto:21.0.1
 LABEL version=${APP_VERSION} description="EPAM Report portal. Jobs Service" maintainer="Andrei Varabyeu <andrei_varabyeu@epam.com>, Hleb Kanonik <hleb_kanonik@epam.com>"
 ARG APP_VERSION=${APP_VERSION}
 ENV APP_DIR=/usr/app
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 63f0b02..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,43 +0,0 @@
-#!groovy
-
-node {
-
-    load "$JENKINS_HOME/jobvars.env"
-
-    env.JAVA_HOME = "${tool 'openjdk-11'}"
-    env.PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
-
-    stage('Checkout') {
-        checkout scm
-    }
-    stage('Assemble') {
-        sh "./gradlew clean assemble -P buildNumber=${env.BUILD_NUMBER}"
-    }
-    stage('Test') {
-        sh './gradlew test --full-stacktrace'
-    }
-    stage('Build') {
-        sh './gradlew build'
-    }
-    stage('Docker image') {
-        sh "./gradlew buildDocker"
-    }
-    stage('Push to registries') {
-        withEnv(["AWS_URI=${AWS_URI}", "AWS_REGION=${AWS_REGION}"]) {
-            sh 'docker tag reportportal-dev/service-jobs ${AWS_URI}/service-jobs:SNAPSHOT-${BUILD_NUMBER}'
-            def image = env.AWS_URI + '/service-jobs' + ':SNAPSHOT-' + env.BUILD_NUMBER
-            def url = 'https://' + env.AWS_URI
-            def credentials = 'ecr:' + env.AWS_REGION + ':aws_credentials'
-            echo image
-            docker.withRegistry(url, credentials) {
-                docker.image(image).push()
-            }
-        }
-    }
-    stage('Cleanup') {
-        withEnv(["AWS_URI=${AWS_URI}"]) {
-            sh 'docker rmi ${AWS_URI}/service-jobs:SNAPSHOT-${BUILD_NUMBER}'
-            sh 'docker rmi reportportal-dev/service-jobs:latest'
-        }
-    }
-}
diff --git a/Jenkinsfile-candidate b/Jenkinsfile-candidate
deleted file mode 100644
index dae8716..0000000
--- a/Jenkinsfile-candidate
+++ /dev/null
@@ -1,57 +0,0 @@
-#!groovy
-properties([
-        parameters([
-                string(
-                        name: "VERSION",
-                        defaultValue: "",
-                        description: "Release candidate version tag"
-                ),
-                string(
-                        name: "BRANCH",
-                        defaultValue: "",
-                        description: "Specify the GitHub branch from which the image will be built"
-                )
-        ])
-])
-
-node {
-
-    load "$JENKINS_HOME/jobvars.env"
-
-    env.JAVA_HOME = "${tool 'openjdk-11'}"
-    env.PATH = "${env.JAVA_HOME}/bin:${env.PATH}"
-
-    stage('Checkout') {
-        checkout scm
-    }
-
-    stage('Assemble') {
-        sh "./gradlew clean assemble -P buildNumber=${env.BUILD_NUMBER}"
-    }
-
-    stage('Test') {
-        sh './gradlew test --full-stacktrace'
-    }
-
-    stage('Build') {
-        sh './gradlew build'
-    }
-
-    stage('Push to ECR') {
-        withEnv(["AWS_URI=${AWS_URI}", "AWS_REGION=${AWS_REGION}", "TAG=${VERSION}"]) {
-            def image = env.AWS_URI + '/service-jobs:' + env.TAG + '-RC-' + env.BUILD_NUMBER
-            def url = 'https://' + env.AWS_URI
-            def credentials = 'ecr:' + env.AWS_REGION + ':aws_credentials'
-            sh './gradlew buildDocker -P dockerTag=$AWS_URI/service-jobs:$VERSION-RC-$BUILD_NUMBER'
-            docker.withRegistry(url, credentials) {
-                docker.image(image).push()
-            }
-        }
-    }
-
-    stage('Cleanup') {
-        withEnv(["AWS_URI=${AWS_URI}"]) {
-            sh 'docker rmi ${AWS_URI}/service-jobs:${VERSION}-RC-${BUILD_NUMBER}'
-        }
-    }
-}
diff --git a/build.gradle b/build.gradle
index f23d5b1..264f278 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'org.springframework.boot' version '2.7.17'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'io.spring.dependency-management' version '1.1.4'
     id 'java'
 }
 
@@ -11,9 +11,8 @@ project.ext {
 
 ext['junit-jupiter.version'] = '5.10.0'
 
-def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' + (releaseMode ? '5.10.0' : 'EPMRPP-85756')
+def scriptsUrl = 'https://raw.githubusercontent.com/reportportal/gradle-scripts/' + (releaseMode ? '5.10.0' : 'develop')
 
-apply from: "$scriptsUrl/build-docker.gradle"
 apply from: "$scriptsUrl/build-commons.gradle"
 apply from: "$scriptsUrl/build-info.gradle"
 //apply from: "$scriptsUrl/build-quality.gradle"
@@ -26,7 +25,7 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 wrapper {
-    gradleVersion = '8.4'
+    gradleVersion = '8.5'
 }
 
 bootJar {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3fa8f86..1af9e09 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME