diff --git a/.github/workflows/deploy_fastapi_backend.yml b/.github/workflows/deploy_fastapi_backend.yml
index 0ea40014..c5f26dfd 100644
--- a/.github/workflows/deploy_fastapi_backend.yml
+++ b/.github/workflows/deploy_fastapi_backend.yml
@@ -55,9 +55,9 @@ jobs:
       - name: Set DB credentials
         id: set_db_credentials
         run: |
-          echo "::set-output name=db_host::${{ secrets[format('{0}DB_HOST', github.ref_name)] }}"
-          echo "::set-output name=db_port::${{ secrets[format('{0}DB_PORT', github.ref_name)] }}"
-          echo "::set-output name=db_name::${{ secrets[format('{0}DB_NAME', github.ref_name)] }}"
+          echo "::set-output name=db_host::${{ secrets[format('{0}_DB_HOST', github.ref_name)] }}"
+          echo "::set-output name=db_port::${{ secrets[format('{0}_DB_PORT', github.ref_name)] }}"
+          echo "::set-output name=db_name::${{ secrets[format('{0}_DB_NAME', github.ref_name)] }}"
 
       #      - name: Build Lambda Layer
       #        run: |
@@ -83,12 +83,13 @@ jobs:
           DB_NAME: ${{ steps.set_db_credentials.outputs.db_name }}
         run: |
           # Fetch database credentials from AWS Secrets Manager
-          DB_USER=$(aws secretsmanager get-secret-value --secret-id dev/assessment_model/db_credentials --query SecretString | jq -r '.db_assessment_model_username')
-          DB_PASSWORD=$(aws secretsmanager get-secret-value --secret-id dev/assessment_model/db_credentials --query SecretString | jq -r '.db_assessment_model_password')
+          SECRET_VALUE=$(aws secretsmanager get-secret-value --secret-id dev/assessment_model/db_credentials --query SecretString)
+          DB_USER=$(echo "$SECRET_VALUE" | jq -r '. | fromjson | .db_assessment_model_username')
+          DB_PASSWORD=$(echo "$SECRET_VALUE" | jq -r '. | fromjson | .db_assessment_model_password')
 
           # Set the database credentials as environment variables
           export DB_USER
           export DB_PASSWORD
-          
+
           # Deploy to AWS Lambda via Serverless
           sls deploy --stage ${{ github.ref_name }} --verbose