diff --git a/.github/workflows/click-service-cd.yml b/.github/workflows/click-service-cd.yml
index e5aa07c..b3d30c7 100644
--- a/.github/workflows/click-service-cd.yml
+++ b/.github/workflows/click-service-cd.yml
@@ -22,24 +22,20 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set Kubernetes Yaml
-        uses: microsoft/variable-substitution@v1
-        with:
-          files: ./click-service/resources.yaml
+        run : |
+          envsubst < ./resources.yaml > ./resources.yaml
         env:
-          image: ${{env.REGION}}-docker.pkg.dev/${{env.PROJECT_ID}}/${{env.DOCKER_REPO}}/${{env.WORKSTATION_IMAGE}}
-          spec.template.spec.containers.image: ${{env.image}}
+          spec.template.spec.containers.image: ${{env.REGION}}-docker.pkg.dev/${{env.PROJECT_ID}}/${{env.DOCKER_REPO}}/${{env.WORKSTATION_IMAGE}}
 
       - name: Set Application Yml
-        uses: microsoft/variable-substitution@v1
-        with:
-          files: ./src/main/resources/application-prod.yml
+        run : |
+          envsubst < ./src/main/resources/application-prod.yml > ./src/main/resources/application-prod.yml
         env:
           spring.data.redis.host: ${{secrets.REDIS_HOST}}
           spring.data.redis.port: ${{secrets.REDIS_PORT}}
           spring.datasource.url: ${{secrets.DB_URL}}
           spring.datasource.username: ${{secrets.DB_USERNAME}}
           spring.datasource.password: ${{secrets.DB_PASSWORD}}
-          spec.template.spec.containers.image: ${{env.image}}
 
       - name: Set up google auth
         id: 'auth'
@@ -61,7 +57,7 @@ jobs:
       - name: Set up Java version
         uses: actions/setup-java@v1
         with:
-            java-version: '17'
+          java-version: '17'
 
       - name: Run tests
         run: ../gradlew test
diff --git a/.github/workflows/transfer-service-cd.yml b/.github/workflows/transfer-service-cd.yml
index 2ee1cc2..0f04ca7 100644
--- a/.github/workflows/transfer-service-cd.yml
+++ b/.github/workflows/transfer-service-cd.yml
@@ -22,16 +22,14 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set Application Yml
-        uses: microsoft/variable-substitution@v1
-        with:
-          files: ./transfer-service/src/main/resources/application-prod.yml
+        run : |
+          envsubst < ./src/main/resources/application-prod.yml > ./src/main/resources/application-prod.yml
         env:
           spring.data.redis.host: ${{secrets.REDIS_HOST}}
           spring.data.redis.port: ${{secrets.REDIS_PORT}}
           spring.datasource.url: ${{secrets.DB_URL}}
           spring.datasource.username: ${{secrets.DB_USERNAME}}
           spring.datasource.password: ${{secrets.DB_PASSWORD}}
-          spec.template.spec.containers.image: ${{env.image}}
 
       - name: Set up google auth
         id: 'auth'