diff --git a/.github/workflows/ci-java.yml b/.github/workflows/ci-java.yml
index e3349be5..0cae6a72 100644
--- a/.github/workflows/ci-java.yml
+++ b/.github/workflows/ci-java.yml
@@ -12,6 +12,7 @@ on:
       - release/**
     paths:
       - "apps/user-service/**"
+      - ".github/workflows/ci-java.yml"
 
 permissions:
   contents: read
@@ -32,12 +33,17 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'temurin'
-          cache: 'gradle'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          cache-read-only: ${{ github.event_name == 'pull_request' }}
 
       - name: Grant execute permission for Gradle wrapper
         run: chmod +x ./gradlew
@@ -59,12 +65,17 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v4
         with:
           java-version: '${{ matrix.java-version }}'
           distribution: 'temurin'
-          cache: 'gradle'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          cache-read-only: ${{ github.event_name == 'pull_request' }}
 
       - name: Grant execute permission for Gradle wrapper
         run: chmod +x ./gradlew
diff --git a/apps/user-service/gradle.properties b/apps/user-service/gradle.properties
new file mode 100644
index 00000000..5f1ed7bb
--- /dev/null
+++ b/apps/user-service/gradle.properties
@@ -0,0 +1 @@
+org.gradle.caching=true
\ No newline at end of file
diff --git a/apps/user-service/src/test/java/site/icebang/TestUserServiceApplication.java b/apps/user-service/src/test/java/site/icebang/TestUserServiceApplication.java
deleted file mode 100644
index ba8c2403..00000000
--- a/apps/user-service/src/test/java/site/icebang/TestUserServiceApplication.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package site.icebang;
-
-import org.springframework.boot.SpringApplication;
-
-public class TestUserServiceApplication {
-
-  public static void main(String[] args) {
-    SpringApplication.from(UserServiceApplication::main)
-        .with(TestcontainersConfiguration.class)
-        .run(args);
-  }
-}
diff --git a/apps/user-service/src/test/java/site/icebang/TestcontainersConfiguration.java b/apps/user-service/src/test/java/site/icebang/TestcontainersConfiguration.java
deleted file mode 100644
index b9eb7b76..00000000
--- a/apps/user-service/src/test/java/site/icebang/TestcontainersConfiguration.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package site.icebang;
-
-import org.springframework.boot.test.context.TestConfiguration;
-
-@TestConfiguration(proxyBeanMethods = false)
-class TestcontainersConfiguration {}