diff --git a/.gitignore b/.gitignore
index e0add4e..3d22eca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,8 @@
 hs_err_pid*
 
 .vscode/*
-.vscode
\ No newline at end of file
+.vscode
+spring-cloud-gateway/.mvn/wrapper/maven-wrapper.jar
+spring-cloud-gateway/mvnw.cmd
+spring-cloud-gateway/mvnw
+.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/airtel-store-service/Dockerfile b/airtel-store-service/Dockerfile
index d6098cc..8fa2e45 100644
--- a/airtel-store-service/Dockerfile
+++ b/airtel-store-service/Dockerfile
@@ -1,5 +1,5 @@
-FROM openjdk:8-jdk-alpine
-RUN adduser -D demo
+FROM openjdk:17-jdk-slim-buster
+RUN useradd demo
 USER demo
 VOLUME /tmp
 ADD target/airtel-store-service-*.jar app.jar
diff --git a/airtel-store-service/pom.xml b/airtel-store-service/pom.xml
index bd460d1..41ee018 100644
--- a/airtel-store-service/pom.xml
+++ b/airtel-store-service/pom.xml
@@ -14,15 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.5.RELEASE</version>
+		<version>3.0.2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+		<java.version>17</java.version>
+		<spring-cloud.version>2022.0.1</spring-cloud.version>
 	</properties>
 
 	<dependencies>
@@ -58,6 +58,23 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.persistence</groupId>
+			<artifactId>jakarta.persistence-api</artifactId>
+			<version>3.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>2.1.1</version>
+			<scope>compile</scope>
+		</dependency>	
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>		
 	</dependencies>
 
 	<build>
diff --git a/airtel-store-service/src/main/java/com/barath/airtel/app/entity/Customer.java b/airtel-store-service/src/main/java/com/barath/airtel/app/entity/Customer.java
index b2a4cbb..cf9ed60 100644
--- a/airtel-store-service/src/main/java/com/barath/airtel/app/entity/Customer.java
+++ b/airtel-store-service/src/main/java/com/barath/airtel/app/entity/Customer.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 /**
  * @author barath
diff --git a/airtel-store-service/src/main/java/com/barath/airtel/app/service/CustomerService.java b/airtel-store-service/src/main/java/com/barath/airtel/app/service/CustomerService.java
index b0281f6..c8d5560 100644
--- a/airtel-store-service/src/main/java/com/barath/airtel/app/service/CustomerService.java
+++ b/airtel-store-service/src/main/java/com/barath/airtel/app/service/CustomerService.java
@@ -3,7 +3,7 @@
 import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/config-server/Dockerfile b/config-server/Dockerfile
index ce2f244..0f0cd2c 100644
--- a/config-server/Dockerfile
+++ b/config-server/Dockerfile
@@ -1,5 +1,5 @@
-FROM openjdk:8-jdk-alpine
-RUN adduser -D demo 
+FROM openjdk:17-jdk-slim-buster
+RUN useradd demo 
 USER demo
 VOLUME /tmp
 ADD target/config-server-*.jar app.jar
diff --git a/config-server/pom.xml b/config-server/pom.xml
index 0f0b6c6..bf1d5db 100644
--- a/config-server/pom.xml
+++ b/config-server/pom.xml
@@ -14,15 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.5.RELEASE</version>
+		<version>3.0.2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+		<java.version>17</java.version>
+		<spring-cloud.version>2022.0.1</spring-cloud.version>
 	</properties>
 
 	<dependencies>
@@ -50,6 +50,17 @@
 			<artifactId>reactor-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.persistence</groupId>
+			<artifactId>jakarta.persistence-api</artifactId>
+			<version>3.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>		
 	</dependencies>
 
 	<dependencyManagement>
diff --git a/eureka-server/Dockerfile b/eureka-server/Dockerfile
index e4f0236..8a9e7d0 100644
--- a/eureka-server/Dockerfile
+++ b/eureka-server/Dockerfile
@@ -1,5 +1,5 @@
-FROM openjdk:8-jdk-alpine
-RUN adduser -D demo 
+FROM openjdk:17-jdk-slim-buster
+RUN useradd demo 
 USER demo
 ADD target/eureka-server-*.jar app.jar
 ENTRYPOINT ["java","-jar","app.jar"]
diff --git a/eureka-server/Dockerfile.build b/eureka-server/Dockerfile.build
index f2ac469..d4dd782 100644
--- a/eureka-server/Dockerfile.build
+++ b/eureka-server/Dockerfile.build
@@ -8,9 +8,9 @@ RUN mvn clean install
 
 # Final stage
 
-FROM openjdk:8-jdk-alpine as final
+FROM openjdk:17-jdk-slim-buster as final
 # best practice is not to use root user
-RUN adduser -D demo 
+RUN useradd demo 
 USER demo
 COPY --from=builder  /opt/target/eureka-server-*.jar app.jar
 ENTRYPOINT ["java","-jar","app.jar"]
diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml
index 7bafd40..e2d8152 100644
--- a/eureka-server/pom.xml
+++ b/eureka-server/pom.xml
@@ -14,15 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.5.RELEASE</version>
+		<version>3.0.2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+		<java.version>17</java.version>
+		<spring-cloud.version>2022.0.1</spring-cloud.version>
 	</properties>
 
 	<dependencies>
@@ -46,6 +46,17 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.persistence</groupId>
+			<artifactId>jakarta.persistence-api</artifactId>
+			<version>3.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>		
 	</dependencies>
 
 	<dependencyManagement>
diff --git a/jio-store-service/Dockerfile b/jio-store-service/Dockerfile
index d7c0481..6cf2cbf 100644
--- a/jio-store-service/Dockerfile
+++ b/jio-store-service/Dockerfile
@@ -1,5 +1,5 @@
-FROM openjdk:8-jdk-alpine
-RUN adduser -D demo
+FROM openjdk:17-jdk-slim-buster
+RUN useradd demo
 USER demo
 VOLUME /tmp
 ADD target/jio-store-service-*.jar app.jar
diff --git a/jio-store-service/pom.xml b/jio-store-service/pom.xml
index ae3b79e..6d08a7f 100644
--- a/jio-store-service/pom.xml
+++ b/jio-store-service/pom.xml
@@ -14,15 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.5.RELEASE</version>
+		<version>3.0.2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+		<java.version>17</java.version>
+		<spring-cloud.version>2022.0.1</spring-cloud.version>
 	</properties>
 
 	<dependencies>
@@ -57,6 +57,23 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.persistence</groupId>
+			<artifactId>jakarta.persistence-api</artifactId>
+			<version>3.1.0</version>
+		</dependency>		
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>2.1.1</version>
+			<scope>compile</scope>
+		</dependency>	
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>			
 	</dependencies>
 
 	<build>
diff --git a/jio-store-service/src/main/java/com/barath/jio/app/entity/Customer.java b/jio-store-service/src/main/java/com/barath/jio/app/entity/Customer.java
index 61bf0bf..fcb3e7b 100644
--- a/jio-store-service/src/main/java/com/barath/jio/app/entity/Customer.java
+++ b/jio-store-service/src/main/java/com/barath/jio/app/entity/Customer.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 /**
  * @author barath
diff --git a/jio-store-service/src/main/java/com/barath/jio/app/service/CustomerService.java b/jio-store-service/src/main/java/com/barath/jio/app/service/CustomerService.java
index e83b9c7..5714d9b 100644
--- a/jio-store-service/src/main/java/com/barath/jio/app/service/CustomerService.java
+++ b/jio-store-service/src/main/java/com/barath/jio/app/service/CustomerService.java
@@ -3,7 +3,7 @@
 import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/pom.xml b/pom.xml
index 702f2a4..776ddd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>		
+		<java.version>17</java.version>		
 	</properties>
 
 	
diff --git a/spring-cloud-gateway/Dockerfile b/spring-cloud-gateway/Dockerfile
index 2dd4eae..0245e16 100644
--- a/spring-cloud-gateway/Dockerfile
+++ b/spring-cloud-gateway/Dockerfile
@@ -1,5 +1,5 @@
-FROM openjdk:8-jdk-alpine
-RUN adduser -D demo 
+FROM openjdk:17-jdk-slim-buster
+RUN useradd demo 
 USER demo
 VOLUME /tmp
 ADD target/spring-cloud-gateway-*.jar app.jar
diff --git a/spring-cloud-gateway/pom.xml b/spring-cloud-gateway/pom.xml
index 56f089a..c042772 100644
--- a/spring-cloud-gateway/pom.xml
+++ b/spring-cloud-gateway/pom.xml
@@ -14,15 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.5.RELEASE</version>
+		<version>3.0.2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+		<java.version>17</java.version>
+		<spring-cloud.version>2022.0.1</spring-cloud.version>
 	</properties>
 
 	<dependencies>
@@ -38,10 +38,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-gateway</artifactId>
 		</dependency>
-		 <dependency>
-	        <groupId>org.springframework.cloud</groupId>
-	        <artifactId>spring-cloud-starter-sleuth</artifactId>
-	    </dependency>
 	    <dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
@@ -55,7 +51,24 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-		</dependency>
+		</dependency>	
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>			
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>2.1.1</version>
+			<scope>compile</scope>
+		</dependency>		
+		<dependency>
+			<groupId>javax.persistence</groupId>
+			<artifactId>persistence-api</artifactId>
+			<version>1.0.2</version>
+		</dependency>		
 	</dependencies>
 
 	<dependencyManagement>
diff --git a/spring-cloud-gateway/src/main/java/com/barath/gateway/app/GatewayApplication.java b/spring-cloud-gateway/src/main/java/com/barath/gateway/app/GatewayApplication.java
index 2d85207..936098a 100644
--- a/spring-cloud-gateway/src/main/java/com/barath/gateway/app/GatewayApplication.java
+++ b/spring-cloud-gateway/src/main/java/com/barath/gateway/app/GatewayApplication.java
@@ -3,7 +3,7 @@
 import java.lang.invoke.MethodHandles;
 import java.util.Objects;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/vodaphone-store-service/Dockerfile b/vodaphone-store-service/Dockerfile
index e8ec040..2354d15 100644
--- a/vodaphone-store-service/Dockerfile
+++ b/vodaphone-store-service/Dockerfile
@@ -1,5 +1,5 @@
-FROM openjdk:8-jdk-alpine
-RUN adduser -D demo 
+FROM openjdk:17-jdk-slim-buster
+RUN useradd demo 
 USER demo
 VOLUME /tmp
 ADD target/vodaphone-store-service-*.jar app.jar
diff --git a/vodaphone-store-service/pom.xml b/vodaphone-store-service/pom.xml
index 1ce50dc..07dce59 100644
--- a/vodaphone-store-service/pom.xml
+++ b/vodaphone-store-service/pom.xml
@@ -14,15 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.5.RELEASE</version>
+		<version>3.0.2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+		<java.version>17</java.version>
+		<spring-cloud.version>2022.0.1</spring-cloud.version>
 	</properties>
 
 	<dependencies>
@@ -58,6 +58,23 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.persistence</groupId>
+			<artifactId>jakarta.persistence-api</artifactId>
+			<version>3.1.0</version>
+		</dependency>		
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>2.1.1</version>
+			<scope>compile</scope>
+		</dependency>			
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>			
 	</dependencies>
 
 	<build>
diff --git a/vodaphone-store-service/src/main/java/com/barath/vodaphone/app/entity/Customer.java b/vodaphone-store-service/src/main/java/com/barath/vodaphone/app/entity/Customer.java
index b240a46..b58ba74 100644
--- a/vodaphone-store-service/src/main/java/com/barath/vodaphone/app/entity/Customer.java
+++ b/vodaphone-store-service/src/main/java/com/barath/vodaphone/app/entity/Customer.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 /**
  * Created by barath on 03/03/18.
diff --git a/vodaphone-store-service/src/main/java/com/barath/vodaphone/app/service/CustomerService.java b/vodaphone-store-service/src/main/java/com/barath/vodaphone/app/service/CustomerService.java
index d9b5cbe..66650d0 100644
--- a/vodaphone-store-service/src/main/java/com/barath/vodaphone/app/service/CustomerService.java
+++ b/vodaphone-store-service/src/main/java/com/barath/vodaphone/app/service/CustomerService.java
@@ -9,7 +9,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.lang.invoke.MethodHandles;
 import java.util.Arrays;
 import java.util.List;