diff --git a/.github/workflows/deploy-manually.yml b/.github/workflows/deploy-manually.yml
index 11f0b37..b394269 100644
--- a/.github/workflows/deploy-manually.yml
+++ b/.github/workflows/deploy-manually.yml
@@ -142,55 +142,22 @@ jobs:
           docker system prune --volumes -a -f
           docker system df
 
-  # k8s-setup:
-  #   needs: [extract_environment]
-  #   uses: ./.github/workflows/k8s-setup.yml
-  #   with:
-  #     cloud: oracle
-  #     environment: ${{ needs.extract_environment.outputs.environment }}
-  #   secrets: inherit
+  k8s-setup:
+    needs: [extract_environment]
+    uses: ./.github/workflows/k8s-setup.yml
+    with:
+      cloud: oracle
+      environment: ${{ needs.extract_environment.outputs.environment }}
+    secrets: inherit
 
   helmfile-deploy:
-    needs: [extract_environment, semantic_release, build_ecr_image]
+    needs: [extract_environment, semantic_release, build_ecr_image, k8s-setup]
     runs-on: [self-hosted, "prd-oracle"]
-    env:
-      HOME: /home/runner
-    environment: ${{ needs.extract_environment.outputs.environment }}
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Install OCI CLI
-        run: |
-          bash -c "$(curl -L https://raw.githubusercontent.com/oracle/oci-cli/master/scripts/install/install.sh)" -- --accept-all-defaults
-          echo "$HOME/bin" >> $GITHUB_PATH
-
-      - name: Configure OCI CLI
-        run: |
-          mkdir -p ~/.oci || true
-          echo "${{ secrets.OCI_CONFIG }}" > ~/.oci/config
-          echo "${{ secrets.OCI_PRIVATE_KEY }}" > ~/.oci/oci_api_key.pem 
-          chmod 600 ~/.oci/oci_api_key.pem
-
-      - name: Authenticate with OKE cluster
-        env:
-          ENV: ${{ inputs.environment }}
-          STG_CLUSTER_ID: "ocid1.cluster.oc1.sa-saopaulo-1.aaaaaaaagh3jvln52a3ebm3dodx6emmhv5bmfs7i7sv2k4zkbcbrzcl6v37q"
-          PRD_CLUSTER_ID: "ocid1.cluster.oc1.sa-saopaulo-1.aaaaaaaanf3vptl6hc2tzd4enfd2hfpsht3wikxww5xejc3l7cwfm6l3sndq"
-          HOME: /home/runner
-        run: |
-          if [ "$ENV" = "stg" ]; then
-            CLUSTER_ID=$STG_CLUSTER_ID
-          elif [ "$ENV" = "prd" ]; then
-            CLUSTER_ID=$PRD_CLUSTER_ID
-          else
-            echo "Unknown environment: $ENV"
-            exit 1
-          fi
-          
-          oci ce cluster create-kubeconfig --cluster-id ${CLUSTER_ID} --file $HOME/.kube/config --region sa-saopaulo-1 --token-version 2.0.0 --kube-endpoint PRIVATE_ENDPOINT
-      
       - name: Set up Helm
         uses: azure/setup-helm@v1
         with:
diff --git a/.github/workflows/k8s-setup.yml b/.github/workflows/k8s-setup.yml
index f20a9dc..75fc081 100644
--- a/.github/workflows/k8s-setup.yml
+++ b/.github/workflows/k8s-setup.yml
@@ -40,6 +40,8 @@ jobs:
   oracle:
     if: inputs.cloud == 'oracle'
     runs-on: [self-hosted, "prd-oracle"]
+    env:
+      HOME: /home/runner
     steps:
       - name: Install OCI CLI
         run: |
@@ -58,7 +60,6 @@ jobs:
           ENV: ${{ inputs.environment }}
           STG_CLUSTER_ID: "ocid1.cluster.oc1.sa-saopaulo-1.aaaaaaaagh3jvln52a3ebm3dodx6emmhv5bmfs7i7sv2k4zkbcbrzcl6v37q"
           PRD_CLUSTER_ID: "ocid1.cluster.oc1.sa-saopaulo-1.aaaaaaaanf3vptl6hc2tzd4enfd2hfpsht3wikxww5xejc3l7cwfm6l3sndq"
-          HOME: /home/runner
         run: |
           if [ "$ENV" = "stg" ]; then
             CLUSTER_ID=$STG_CLUSTER_ID