diff --git a/.github/workflows/deploy-to-aws.yaml b/.github/workflows/deploy-to-aws.yaml
index d2bbac8..b67ffd6 100644
--- a/.github/workflows/deploy-to-aws.yaml
+++ b/.github/workflows/deploy-to-aws.yaml
@@ -11,69 +11,12 @@ on:
 
 jobs:
   call-test-workflow:
-    uses: GNS-Science/nshm-github-actions/.github/workflows/python-run-tests.yml@main
-    with:
-      operating-systems: "['ubuntu-latest']"
-      python-versions: "['3.10']"
+    uses: ./.github/workflows/dev.yml
     secrets: inherit
 
-  deploy:
+  call-deploy-workflow:
     needs: call-test-workflow
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20]
-        python-version: ['3.10']
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install and configure Poetry
-        uses: GNS-Science/install-poetry@main
-        with:
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-          installer-parallel: true
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-          check-latest: true
-
-      - name: upgrade NPM
-        run: npm install --location=global npm@latest
-
-      # - name: Verify NPM
-      #   run: npm doctor
-
-      - name: Install Dependencies
-        run: npm install
-
-      - name: List packages
-        run: npm ls	
-
-      - name: Serverless Doctor
-        run: npm run-script sls_doctor
-
-      - 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-region: ap-southeast-2
-
-      - name: Serverless Deploy ....
-        env:
-          ENABLE_METRICS: 0
-        run: |
-          poetry self add poetry-plugin-export
-          if [[ "${{github.base_ref}}" == "main" || "${{github.ref}}" == 'refs/heads/main' ]]; then
-              STAGE=prod npm run-script deploy
-          else
-              STAGE=test npm run-script deploy
-          fi
-
+    uses: GNS-Science/nshm-github-actions/.github/workflows/deploy-to-aws.yml@main
+    with:
+      python-version: '3.10'
+    secrets: inherit
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 4bc2677..2ab2a6a 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -8,6 +8,8 @@ on:
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
+  # Allows us to call the workflow from another workflow
+  workflow_call:
 
 jobs:
   call-test-workflow: