diff --git a/.github/workflows/cd-server.yaml b/.github/workflows/cd-server.yaml
index ebcced8dc0..14895943f4 100644
--- a/.github/workflows/cd-server.yaml
+++ b/.github/workflows/cd-server.yaml
@@ -122,6 +122,22 @@ jobs:
       - name: Checkout code from action
         uses: actions/checkout@v2
 
+      - name: Checkout values.yaml from siren-infra
+        uses: actions/checkout@v4
+        with:
+          repository: KeyvalueSoftwareSystems/siren-infra
+          ref: main
+          token: ${{secrets.SIREN_PAT}}
+          sparse-checkout: |
+            k8s/siren-services/${{ env.SERVICE_NAME }}/${{ needs.prepare-env.outputs.ENV }}-values.yaml
+          sparse-checkout-cone-mode: false
+  
+      - name: Rename values.yaml for Helm
+        shell: bash
+        run: |
+          cp k8s/siren-services/${{ env.SERVICE_NAME }}/${{ needs.prepare-env.outputs.ENV }}-values.yaml ./values.yaml
+          cat ./values.yaml
+
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
@@ -132,8 +148,6 @@ jobs:
         shell: bash
         run: |
           aws eks update-kubeconfig --name ${{ needs.prepare-env.outputs.K8S_CLUSTER }}
-          aws s3 cp s3://${{ needs.prepare-env.outputs.ENVIRONMENT_BUCKET }}/helm/${{ env.SERVICE_NAME }}/values.yaml ./values.yaml 
-          cat ./values.yaml
           aws ecr get-login-password --region ${{ env.AWS_REGION }} | helm registry login --username AWS --password-stdin ${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com
 
           # Construct base Helm command
diff --git a/.github/workflows/cd-ui.yaml b/.github/workflows/cd-ui.yaml
index 7877ad6c2f..c5d84fc2eb 100644
--- a/.github/workflows/cd-ui.yaml
+++ b/.github/workflows/cd-ui.yaml
@@ -122,6 +122,22 @@ jobs:
       - name: Checkout code from action
         uses: actions/checkout@v2
 
+      - name: Checkout values.yaml from siren-infra
+        uses: actions/checkout@v4
+        with:
+          repository: KeyvalueSoftwareSystems/siren-infra
+          ref: main
+          token: ${{secrets.SIREN_PAT}}
+          sparse-checkout: |
+            k8s/siren-services/${{ env.SERVICE_NAME }}/${{ needs.prepare-env.outputs.ENV }}-values.yaml
+          sparse-checkout-cone-mode: false
+  
+      - name: Rename values.yaml for Helm
+        shell: bash
+        run: |
+          cp k8s/siren-services/${{ env.SERVICE_NAME }}/${{ needs.prepare-env.outputs.ENV }}-values.yaml ./values.yaml
+          cat ./values.yaml
+
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
@@ -132,8 +148,6 @@ jobs:
         shell: bash
         run: |
           aws eks update-kubeconfig --name ${{ needs.prepare-env.outputs.K8S_CLUSTER }}
-          aws s3 cp s3://${{ needs.prepare-env.outputs.ENVIRONMENT_BUCKET }}/helm/${{ env.SERVICE_NAME }}/values.yaml ./values.yaml 
-          cat ./values.yaml
           aws ecr get-login-password --region ${{ env.AWS_REGION }} | helm registry login --username AWS --password-stdin ${{ vars[env.AWS_ACCOUNT_ID] }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com
 
           # Construct base Helm command