diff --git a/.github/workflows/actions/lambda-deploy/action.yml b/.github/workflows/actions/lambda-deploy/action.yml
index 0105000..0ca72ea 100644
--- a/.github/workflows/actions/lambda-deploy/action.yml
+++ b/.github/workflows/actions/lambda-deploy/action.yml
@@ -11,6 +11,12 @@ inputs:
   ecr_tf_dir:
     description: "Path to ECR terrform directory"
     required: true
+  aws_access_key_id:
+    description: "AWS access key"
+    required: true
+  aws_secret_access_key:
+    description: "AWS secret key"
+    required: true
   aws_region:
     description: "AWS region"
     required: false
@@ -24,8 +30,8 @@ runs:
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v4
       with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-access-key-id: ${{ inputs.aws_access_key_id }}
+        aws-secret-access-key: ${{ inputs.aws_secret_access_key }}
         aws-region: ${{ inputs.aws_region }}
 
     - name: Log in to Amazon ECR
@@ -36,6 +42,9 @@ runs:
       uses: ./.github/actions/terraform-deploy
       with:
         working_directory: ${{ inputs.ecr_tf_dir }}
+        aws-access-key-id: ${{ inputs.aws_access_key_id }}
+        aws-secret-access-key: ${{ inputs.aws_secret_access_key }}
+        aws-region: ${{ inputs.aws_region }}
 
     - name: Build and push Docker image
       shell: bash
diff --git a/.github/workflows/actions/terraform-deploy/action.yml b/.github/workflows/actions/terraform-deploy/action.yml
index ce73ffc..ecd60f3 100644
--- a/.github/workflows/actions/terraform-deploy/action.yml
+++ b/.github/workflows/actions/terraform-deploy/action.yml
@@ -5,6 +5,16 @@ inputs:
   working_directory:
     description: "Directory containing Terraform config"
     required: true
+  aws_access_key_id:
+    description: "AWS access key"
+    required: true
+  aws_secret_access_key:
+    description: "AWS secret key"
+    required: true
+  aws_region:
+    description: "AWS region"
+    required: false
+    default: "eu-west-2"
 
 runs:
   using: "composite"
@@ -18,25 +28,25 @@ runs:
       working-directory: ${{ inputs.working_directory }}
       shell: bash
       env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        AWS_REGION: ${{ secrets.AWS_REGION }}
+        AWS_ACCESS_KEY_ID: ${{ inputs.aws_access_key_id }}
+        AWS_SECRET_ACCESS_KEY: ${{ inputs.aws_secret_access_key }}
+        AWS_REGION: ${{ inputs.aws_region }}
       run: terraform init -reconfigure
 
     - name: Terraform Plan
       working-directory: ${{ inputs.working_directory }}
       shell: bash
       env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        AWS_REGION: ${{ secrets.AWS_REGION }}
+        AWS_ACCESS_KEY_ID: ${{ inputs.aws_access_key_id }}
+        AWS_SECRET_ACCESS_KEY: ${{ inputs.aws_secret_access_key }}
+        AWS_REGION: ${{ inputs.aws_region }}
       run: terraform plan -out=tfplan
 
     - name: Terraform Apply
       working-directory: ${{ inputs.working_directory }}
       shell: bash
       env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        AWS_REGION: ${{ secrets.AWS_REGION }}
+        AWS_ACCESS_KEY_ID: ${{ inputs.aws_access_key_id }}
+        AWS_SECRET_ACCESS_KEY: ${{ inputs.aws_secret_access_key }}
+        AWS_REGION: ${{ inputs.aws_region }}
       run: terraform apply -auto-approve tfplan
diff --git a/.github/workflows/lambda_main.yml b/.github/workflows/lambda_main.yml
index fdecc83..abee11c 100644
--- a/.github/workflows/lambda_main.yml
+++ b/.github/workflows/lambda_main.yml
@@ -17,6 +17,9 @@ jobs:
         uses: ./.github/workflows/actions/terraform-deploy
         with:
           working_directory: ./deployment/lambda/lambda_shared
+          aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws_region: ${{ secrets.AWS_REGION }}
 
   lambda-ecr-example:
     runs-on: ubuntu-latest
@@ -34,6 +37,9 @@ jobs:
           lambda_name: lambda_example
           dockerfile_path: ./deployment/lambda/lambda_example/docker/Dockerfile
           ecr_tf_dir: ./deployment/lambda/lambda_example/docker/
+          aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws_region: ${{ secrets.AWS_REGION }}
 
   extractor-and-loader:
     runs-on: ubuntu-latest
@@ -51,4 +57,7 @@ jobs:
           lambda_name: extractor_and_loader
           dockerfile_path: ./deployment/lambda/extractor_and_loader/docker/Dockerfile
           ecr_tf_dir: ./deployment/lambda/extractor_and_loader/docker/
+          aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws_region: ${{ secrets.AWS_REGION }}