diff --git a/examples/production_puya_react/.algokit.toml b/examples/production_puya_react/.algokit.toml
index 378317e..cafa822 100644
--- a/examples/production_puya_react/.algokit.toml
+++ b/examples/production_puya_react/.algokit.toml
@@ -4,3 +4,6 @@ min_version = "v1.12.0"
 [project]
 type = 'workspace'
 projects_root_path = 'projects'
+
+[project.run]
+build = ['production_puya_react-contracts', 'production_puya_react-frontend']
diff --git a/examples/production_puya_react/.copier-answers.yml b/examples/production_puya_react/.copier-answers.yml
index 58cc024..e60ba05 100644
--- a/examples/production_puya_react/.copier-answers.yml
+++ b/examples/production_puya_react/.copier-answers.yml
@@ -3,6 +3,7 @@ _commit: <commit>
 _src_path: <src>
 author_email: None
 author_name: None
+cloud_provider: netlify
 contract_name: hello_world
 deployment_language: python
 preset_name: production
diff --git a/examples/production_puya_react/.github/workflows/frontend-cd.yaml b/examples/production_puya_react/.github/workflows/frontend-cd.yaml
deleted file mode 100644
index 4d8383c..0000000
--- a/examples/production_puya_react/.github/workflows/frontend-cd.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-name: Frontend CD
-
-on:
-  workflow_call:
-
-permissions:
-  contents: read
-  packages: read
-
-jobs:
-  lint-and-build:
-    name: CI dApp
-    uses: ./.github/workflows/frontend-ci.yaml
-    with:
-      run-build: true
-    
-
-  deploy:
-    runs-on: ubuntu-latest
-    name: Deploy to Netlify
-    environment: Prod
-    concurrency: "${{ github.workflow }}-prod"
-    needs:
-      - lint-and-build
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      
-      - name: Download build artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: dist
-          path: frontend/dist
-
-      - name: Replace template vars
-        uses: makerxstudio/shared-config/.github/actions/placeholder-transforms@main
-        with:
-          app-artifact-path: ./projects/{{ project_name }}-app/dist
-          static-site-transforms: |-
-            VITE_ALGOD_TOKEN:${{ secrets.VITE_ALGOD_TOKEN }}
-            VITE_ALGOD_SERVER:${{ vars.VITE_ALGOD_SERVER }}
-            VITE_ALGOD_PORT:${{ vars.VITE_ALGOD_PORT }}
-            VITE_ALGOD_NETWORK:${{ vars.VITE_ALGOD_NETWORK }}
-            VITE_INDEXER_SERVER:${{ vars.VITE_INDEXER_SERVER }}
-            VITE_INDEXER_PORT:${{ vars.VITE_INDEXER_PORT }}
-            VITE_INDEXER_TOKEN:${{ secrets.VITE_INDEXER_TOKEN }}
-            VITE_ENVIRONMENT:${{ vars.VITE_ENVIRONMENT }}
-
-      - name: Install netlify cli
-        working-directory: ./projects/{{ project_name }}-app
-        run: npm i netlify-cli
-
-      - name: Publish to netlify
-        working-directory: ./projects/{{ project_name }}-app
-        run: netlify deploy --prod --dir "dist"
-        env:
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          # Set your vercel project env variables on your github repository (see README in frontend folder for more info)
-      
diff --git a/examples/production_puya_react/.github/workflows/frontend-ci.yaml b/examples/production_puya_react/.github/workflows/frontend-ci.yaml
deleted file mode 100644
index 9139e03..0000000
--- a/examples/production_puya_react/.github/workflows/frontend-ci.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-name: Frontend CI
-
-on:
-  workflow_call:
-    inputs:
-      run-build:
-        required: false
-        type: boolean
-        default: false
-
-jobs:
-  checks:
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-
-      - name: Install algokit
-        run: pipx install algokit
-
-      - name: Install dependencies
-        working-directory: ./projects/production_puya_react-app
-        run: npm ci
-
-      - name: Run linters
-        working-directory: ./projects/production_puya_react-app
-        run: npm run lint
-
-      - name: Run unit tests
-        working-directory: ./projects/production_puya_react-app
-        run: npm run test
-
-      - name: Create placeholder .env file
-        if: ${{ inputs.run-build }}
-        uses: makerxstudio/shared-config/.github/actions/env-to-placeholders@main
-        with:
-          env-output-path: ./projects/production_puya_react-app/.env
-          env-template-path: ./projects/production_puya_react-app/.env.template
-          env-variable-prefix: VITE_
-
-      - name: Build
-        if: ${{ inputs.run-build }}
-        working-directory: ./projects/production_puya_react-app
-        run: npm run build
-
-      - name: Archive
-        if: ${{ inputs.run-build }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: dist
-          path: frontend/dist/
diff --git a/examples/production_puya_react/.github/workflows/pr.yaml b/examples/production_puya_react/.github/workflows/pr.yaml
deleted file mode 100644
index 898434f..0000000
--- a/examples/production_puya_react/.github/workflows/pr.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Pull Request validation
-
-on: [pull_request]
-
-jobs:
-    smart-contracts-ci:
-        name: Smart Contracts CI
-        uses: ./.github/workflows/smart-contracts-ci.yaml
-
-    frontend-ci:
-        name: Frontend CI
-        uses: ./.github/workflows/frontend-ci.yaml
diff --git a/examples/production_puya_react/.github/workflows/smart-contracts-cd.yaml b/examples/production_puya_react/.github/workflows/production-puya-react-contracts-cd.yaml
similarity index 60%
rename from examples/production_puya_react/.github/workflows/smart-contracts-cd.yaml
rename to examples/production_puya_react/.github/workflows/production-puya-react-contracts-cd.yaml
index a617bfd..10b07e3 100644
--- a/examples/production_puya_react/.github/workflows/smart-contracts-cd.yaml
+++ b/examples/production_puya_react/.github/workflows/production-puya-react-contracts-cd.yaml
@@ -1,19 +1,13 @@
-name: Backend CD
+name: Release production_puya_react-contracts
 
 on:
   workflow_call:
 
-concurrency: release
-
 jobs:
-  ci-check:
-    name: Perform smart contract checks
-    uses: ./.github/workflows/smart-contracts-ci.yaml
-
   deploy-testnet:
-    runs-on: 'ubuntu-latest'
-    needs: ci-check
-    environment: Test
+    runs-on: "ubuntu-latest"
+    
+    environment: contract-testnet
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
@@ -24,26 +18,23 @@ jobs:
       - name: Set up Python 3.12
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
-          cache: 'poetry'
+          python-version: "3.12"
+          cache: "poetry"
 
       - name: Install algokit
-        run: pipx install algokit
+        run: pipx install git+https://github.com/algorandfoundation/algokit-cli@feat/orchestration-linking
 
       - name: Bootstrap dependencies
-        working-directory: ./projects/production_puya_react-contracts
-        run: algokit bootstrap all
+        run: algokit bootstrap all --project-name 'production_puya_react-contracts'
 
       - name: Configure git
         shell: bash
-        working-directory: ./projects/production_puya_react-contracts
         run: |
           # set git user and email as test invoke git
           git config --global user.email "actions@github.com" && git config --global user.name "github-actions"
 
       - name: Deploy to testnet
-        working-directory: ./projects/production_puya_react-contracts
-        run: algokit deploy testnet
+        run: algokit deploy testnet --project-name 'production_puya_react-contracts'
         env:
           # This is the account that becomes the creator of the contract
           DEPLOYER_MNEMONIC: ${{ secrets.DEPLOYER_MNEMONIC }}
diff --git a/examples/production_puya_react/.github/workflows/production-puya-react-contracts-ci.yaml b/examples/production_puya_react/.github/workflows/production-puya-react-contracts-ci.yaml
new file mode 100644
index 0000000..33e7891
--- /dev/null
+++ b/examples/production_puya_react/.github/workflows/production-puya-react-contracts-ci.yaml
@@ -0,0 +1,59 @@
+name: Validate production_puya_react-contracts
+
+on:
+  workflow_call:
+
+jobs:
+  validate:
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+
+      - name: Install poetry
+        run: pipx install poetry
+
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+          cache: "poetry"
+
+      - name: Install algokit
+        run: pipx install git+https://github.com/algorandfoundation/algokit-cli@feat/orchestration-linking
+
+      - name: Start LocalNet
+        run: algokit localnet start
+
+      - name: Bootstrap dependencies
+        run: algokit bootstrap all --project-name 'production_puya_react-contracts'
+
+      - name: Configure git
+        shell: bash
+        run: |
+          # set git user and email as test invoke git
+          git config --global user.email "actions@github.com" && git config --global user.name "github-actions"
+
+      - name: Audit python dependencies
+        run: algokit project run audit --project-name 'production_puya_react-contracts'
+
+      - name: Lint and format python dependencies
+        run: algokit project run lint --project-name 'production_puya_react-contracts'
+
+      - name: Run tests
+        shell: bash
+        run: |
+          set -o pipefail
+          algokit project run test --project-name 'production_puya_react-contracts'
+
+      - name: Build smart contracts
+        run: algokit project run build --project-name 'production_puya_react-contracts'
+
+      - name: Scan TEAL files for issues
+        run: algokit project run audit-teal --project-name 'production_puya_react-contracts'
+
+      - name: Check output stability of the smart contracts
+        run: algokit project run ci-teal-diff --project-name 'production_puya_react-contracts'
+
+      - name: Run deployer against LocalNet
+        run: algokit project deploy localnet --project-name 'production_puya_react-contracts'
diff --git a/examples/production_puya_react/.github/workflows/production-puya-react-frontend-cd.yaml b/examples/production_puya_react/.github/workflows/production-puya-react-frontend-cd.yaml
new file mode 100644
index 0000000..32da007
--- /dev/null
+++ b/examples/production_puya_react/.github/workflows/production-puya-react-frontend-cd.yaml
@@ -0,0 +1,39 @@
+name: Release production_puya_react-frontend
+
+on:
+  workflow_call:
+permissions:
+  contents: read
+  packages: read
+
+jobs:
+  
+  deploy:
+    runs-on: ubuntu-latest
+    name: Deploy to Netlify
+    environment: frontend-prod
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install algokit
+        run: pipx install git+https://github.com/algorandfoundation/algokit-cli@feat/orchestration-linking
+
+      - name: Bootstrap dependencies
+        run: algokit bootstrap all --project-name 'production_puya_react-frontend'
+    
+      - name: Publish to Netlify
+        env:
+          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+        run: |
+          npm install --global netlify-cli@latest
+          netlify login
+          netlify deploy --build --prod
+    
\ No newline at end of file
diff --git a/examples/production_puya_react/.github/workflows/production-puya-react-frontend-ci.yaml b/examples/production_puya_react/.github/workflows/production-puya-react-frontend-ci.yaml
new file mode 100644
index 0000000..9bb6f8e
--- /dev/null
+++ b/examples/production_puya_react/.github/workflows/production-puya-react-frontend-ci.yaml
@@ -0,0 +1,47 @@
+name: Validate production_puya_react-frontend
+
+on:
+  
+  workflow_call:
+  
+
+jobs:
+  validate:
+    runs-on: 'ubuntu-latest'
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Install poetry
+        run: pipx install poetry
+
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+          cache: "poetry"
+
+      - name: Install algokit
+        run: pipx install git+https://github.com/algorandfoundation/algokit-cli@feat/orchestration-linking
+
+      - name: Install dependencies
+        run: algokit bootstrap all --project-name 'production_puya_react-frontend'
+
+      
+      - name: Run linters
+        run: algokit project run lint --project-name 'production_puya_react-frontend'
+      
+      
+      - name: Run unit tests
+        run: algokit project run test --project-name 'production_puya_react-frontend'
+      
+
+      - name: Build
+        run: algokit project run build --project-name 'production_puya_react-frontend'
diff --git a/examples/production_puya_react/.github/workflows/release.yaml b/examples/production_puya_react/.github/workflows/release.yaml
index 58494c1..e40bd29 100644
--- a/examples/production_puya_react/.github/workflows/release.yaml
+++ b/examples/production_puya_react/.github/workflows/release.yaml
@@ -1,27 +1,38 @@
 name: Release
 
 on:
-    push:
-        branches:
-            - main
-        paths-ignore:
-            - "docs/**"
-            - "**.md"
-            - ".vscode/**"
-            - ".idea/**"
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - 'docs/**'
+      - '**.md'
+      - '.vscode/**'
+      - '.idea/**'
 
 permissions:
   contents: read
   packages: read
 
 jobs:
-    backend-release:
-        name: Backend Release
-        secrets: inherit
-        uses: ./.github/workflows/smart-contracts-cd.yaml
+  production_puya_react-contracts-validate:
+    name: Run production_puya_react-contracts release
+    secrets: inherit
+    uses: ./.github/workflows/production_puya_react-contracts-ci.yaml
 
-    frontend-release:
-        name: Frontend Release
-        secrets: inherit
-        uses: ./.github/workflows/frontend-cd.yaml
-        needs: backend-release
+  production_puya_react-contracts-release:
+    name: Run production_puya_react-contracts release
+    secrets: inherit
+    uses: ./.github/workflows/production_puya_react-contracts-cd.yaml
+    needs: production_puya_react-contracts-validate
+
+  production_puya_react-frontend-validate:
+    name: Run production_puya_react-frontend release
+    secrets: inherit
+    uses: ./.github/workflows/production_puya_react-frontend-ci.yaml
+
+  production_puya_react-frontend-release:
+    name: Run production_puya_react-frontend release
+    secrets: inherit
+    uses: ./.github/workflows/production_puya_react-frontend-cd.yaml
+    needs: production_puya_react-frontend-validate
diff --git a/examples/production_puya_react/.github/workflows/smart-contracts-ci.yaml b/examples/production_puya_react/.github/workflows/smart-contracts-ci.yaml
deleted file mode 100644
index b07cecd..0000000
--- a/examples/production_puya_react/.github/workflows/smart-contracts-ci.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-name: Backend CI
-
-on:
-    workflow_call:
-
-jobs:
-  checks:
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-
-      - name: Install poetry
-        run: pipx install poetry
-
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-          cache: 'poetry'
-
-      - name: Install algokit
-        run: pipx install algokit
-
-      - name: Start LocalNet
-        run: algokit localnet start
-
-      - name: Bootstrap dependencies
-        run: algokit bootstrap all
-        working-directory: ./projects/production_puya_react-contracts
-
-      - name: Configure git
-        shell: bash
-        working-directory: ./projects/production_puya_react-contracts
-        run: |
-          # set git user and email as test invoke git
-          git config --global user.email "actions@github.com" && git config --global user.name "github-actions"
-
-      - name: Audit with pip-audit
-        working-directory: ./projects/production_puya_react-contracts
-        run: |
-          # audit non dev dependencies, no exclusions
-          poetry export --without=dev > requirements.txt && poetry run pip-audit -r requirements.txt
-
-          # audit all dependencies, with exclusions.
-          # If a vulnerability is found in a dev dependency without an available fix,
-          # it can be temporarily ignored by adding --ignore-vuln e.g.
-          # --ignore-vuln "GHSA-hcpj-qp55-gfph" # GitPython vulnerability, dev only dependency
-          poetry run pip-audit
-
-      - name: Check formatting with Black
-        working-directory: ./projects/production_puya_react-contracts
-        run: |
-          # stop the build if there are files that don't meet formatting requirements
-          poetry run black --check .
-
-      - name: Check linting with Ruff
-        working-directory: ./projects/production_puya_react-contracts
-        run: |
-          # stop the build if there are Python syntax errors or undefined names
-          poetry run ruff .
-
-      - name: Check types with mypy
-        working-directory: ./projects/production_puya_react-contracts
-        run: poetry run mypy
-
-      - name: Run tests
-        working-directory: ./projects/production_puya_react-contracts
-        shell: bash
-        run: |
-          set -o pipefail
-          poetry run pytest --junitxml=pytest-junit.xml
-
-      - name: Build smart contracts
-        working-directory: ./projects/production_puya_react-contracts
-        run: poetry run python -m smart_contracts build
-
-      - name: Check output stability of the smart contracts
-        shell: bash
-        working-directory: ./projects/production_puya_react-contracts
-        run: |
-          # Add untracked files as empty so they come up in diff
-          git add -N ./smart_contracts/artifacts
-          # Error out if there are any changes in teal after generating output
-          git diff --exit-code --minimal ./smart_contracts/artifacts || (echo "::error ::Smart contract artifacts have changed, ensure committed artifacts are up to date" && exit 1);
diff --git a/examples/production_puya_react/.github/workflows/validate.yaml b/examples/production_puya_react/.github/workflows/validate.yaml
new file mode 100644
index 0000000..579a8b5
--- /dev/null
+++ b/examples/production_puya_react/.github/workflows/validate.yaml
@@ -0,0 +1,14 @@
+name: Pull Request validation
+
+on: [pull_request]
+
+
+jobs:
+  production_puya_react-contracts-ci:
+    name: Run production_puya_react-contracts validation
+    uses: ./.github/workflows/production_puya_react-contracts-ci.yaml
+
+  production_puya_react-frontend-ci:
+    name: Run production_puya_react-frontend validation
+    uses: ./.github/workflows/production_puya_react-frontend-ci.yaml
+
diff --git a/examples/production_puya_react/README.md b/examples/production_puya_react/README.md
index e77fea3..6909f81 100644
--- a/examples/production_puya_react/README.md
+++ b/examples/production_puya_react/README.md
@@ -16,7 +16,7 @@ This starter full stack project has been generated using AlgoKit. See below for
    - Run `algokit localnet start` to start a local Algorand network in Docker. If you are using VS Code launch configurations provided by the template, this will be done automatically for you.
 3. Open the project and start debugging / developing on:
    - [production_puya_react-contracts](projects/production_puya_react-contracts/README.md) - Refer to the README for more information on how to work with smart contracts.
-   - [production_puya_react-app](projects/production_puya_react-app/README.md) - Refer to the README for more information on how to work with the frontend application.
+   - [production_puya_react-frontend](projects/production_puya_react-frontend/README.md) - Refer to the README for more information on how to work with the frontend application.
 
 
 ### Subsequently
@@ -48,10 +48,10 @@ It has also been configured to have a productive dev experience out of the box i
 
 ## Integrating with smart contracts and application clients
 
-Refer to the [production_puya_react-contracts](projects/production_puya_react-contracts/README.md) folder for overview of working with smart contracts, [projects/production_puya_react-app](projects/production_puya_react-app/README.md) for overview of the React project and the [projects/production_puya_react-app/contracts](projects/production_puya_react-app/src/contracts/README.md) folder for README on adding new smart contracts from backend as application clients on your frontend. The templates provided in these folders will help you get started.
-When you compile and generate smart contract artifacts, your frontend component will automatically generate typescript application clients from smart contract artifacts and move them to `frontend/src/contracts` folder, see [`generate:app-clients` in package.json](projects/production_puya_react-app/package.json). Afterwards, you are free to import and use them in your frontend application.
+Refer to the [production_puya_react-contracts](projects/production_puya_react-contracts/README.md) folder for overview of working with smart contracts, [projects/production_puya_react-frontend](projects/production_puya_react-frontend/README.md) for overview of the React project and the [projects/production_puya_react-frontend/contracts](projects/production_puya_react-frontend/src/contracts/README.md) folder for README on adding new smart contracts from backend as application clients on your frontend. The templates provided in these folders will help you get started.
+When you compile and generate smart contract artifacts, your frontend component will automatically generate typescript application clients from smart contract artifacts and move them to `frontend/src/contracts` folder, see [`generate:app-clients` in package.json](projects/production_puya_react-frontend/package.json). Afterwards, you are free to import and use them in your frontend application.
 
-The frontend starter also provides an example of interactions with your HelloWorldClient in [`AppCalls.tsx`](projects/production_puya_react-app/src/components/AppCalls.tsx) component by default.
+The frontend starter also provides an example of interactions with your HelloWorldClient in [`AppCalls.tsx`](projects/production_puya_react-frontend/src/components/AppCalls.tsx) component by default.
 
 ## Next Steps
 
diff --git a/examples/production_puya_react/production_puya_react.code-workspace b/examples/production_puya_react/production_puya_react.code-workspace
index e5575f2..6e69c2f 100644
--- a/examples/production_puya_react/production_puya_react.code-workspace
+++ b/examples/production_puya_react/production_puya_react.code-workspace
@@ -8,7 +8,7 @@
       "path": "./projects/production_puya_react-contracts"
     },
     {
-      "path": "./projects/production_puya_react-app"
+      "path": "./projects/production_puya_react-frontend"
     }
   ],
   "settings": {
@@ -61,7 +61,7 @@
             "name": "Deploy contracts",
             "folder": "production_puya_react-contracts"
           },
-          { "name": "Run dApp", "folder": "production_puya_react-app" }
+          { "name": "Run dApp", "folder": "production_puya_react-frontend" }
         ],
         "presentation": {
           "hidden": false,
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.algokit.toml b/examples/production_puya_react/projects/production_puya_react-app/.algokit.toml
deleted file mode 100644
index 13e4b36..0000000
--- a/examples/production_puya_react/projects/production_puya_react-app/.algokit.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[algokit]
-min_version = "v1.3.0b1"
-
-[generate.import_contract]
-description = "Import a typed client from your smart contracts project"
-path = ".algokit/generators/import_contract"
-
-[project]
-type = "frontend"
-name = "production_puya_react-app"
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.idea/runConfigurations/Run_Chrome.xml b/examples/production_puya_react/projects/production_puya_react-app/.idea/runConfigurations/Run_Chrome.xml
deleted file mode 100644
index 9dfeeca..0000000
--- a/examples/production_puya_react/projects/production_puya_react-app/.idea/runConfigurations/Run_Chrome.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Chrome" type="JavascriptDebugType" nameIsGenerated="true" uri="http://localhost:5173/">
-    <method v="2" />
-  </configuration>
-</component>
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.idea/runConfigurations/Run_dApp.xml b/examples/production_puya_react/projects/production_puya_react-app/.idea/runConfigurations/Run_dApp.xml
deleted file mode 100644
index 1cf2273..0000000
--- a/examples/production_puya_react/projects/production_puya_react-app/.idea/runConfigurations/Run_dApp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run dApp" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="dev" />
-    </scripts>
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.idea/runConfigurations/Run_dApp____LocalNet_.xml b/examples/production_puya_react/projects/production_puya_react-app/.idea/runConfigurations/Run_dApp____LocalNet_.xml
deleted file mode 100644
index 3758c8b..0000000
--- a/examples/production_puya_react/projects/production_puya_react-app/.idea/runConfigurations/Run_dApp____LocalNet_.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run dApp (+ LocalNet)" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="dev" />
-    </scripts>
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="Start AlgoKit LocalNet" run_configuration_type="ShConfigurationType" />
-    </method>
-  </configuration>
-</component>
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.idea/runConfigurations/Start_AlgoKit_LocalNet.xml b/examples/production_puya_react/projects/production_puya_react-app/.idea/runConfigurations/Start_AlgoKit_LocalNet.xml
deleted file mode 100644
index 0394a67..0000000
--- a/examples/production_puya_react/projects/production_puya_react-app/.idea/runConfigurations/Start_AlgoKit_LocalNet.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Start AlgoKit LocalNet" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="algokit localnet start" />
-    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
-    <option name="SCRIPT_PATH" value="" />
-    <option name="SCRIPT_OPTIONS" value="" />
-    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
-    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
-    <option name="INTERPRETER_PATH" value="/bin/zsh" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="EXECUTE_IN_TERMINAL" value="true" />
-    <option name="EXECUTE_SCRIPT_FILE" value="false" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/examples/production_puya_react/projects/production_puya_react-contracts/.algokit.toml b/examples/production_puya_react/projects/production_puya_react-contracts/.algokit.toml
index e5111bc..27619dc 100644
--- a/examples/production_puya_react/projects/production_puya_react-contracts/.algokit.toml
+++ b/examples/production_puya_react/projects/production_puya_react-contracts/.algokit.toml
@@ -1,19 +1,49 @@
 [algokit]
 min_version = "v1.8.0"
 
-[deploy]
+[generate.smart_contract]
+description = "Adds new smart contract to existing project"
+path = ".algokit/generators/create_contract"
+
+[project]
+type = 'contract'
+name = 'production_puya_react-contracts'
+artifacts = 'smart_contracts/artifacts'
+
+[project.deploy]
 command = "poetry run python -m smart_contracts deploy"
 environment_secrets = [
   "DEPLOYER_MNEMONIC",
+  "DISPENSER_MNEMONIC",
 ]
 
-[deploy.localnet]
+[project.deploy.localnet]
 environment_secrets = []
 
-[generate.smart_contract]
-description = "Adds new smart contract to existing project"
-path = ".algokit/generators/create_contract"
+[project.run]
+# Commands intented for use locally and in CI
+build = { commands = [
+  'poetry run python -m smart_contracts build',
+], description = 'Build all smart contracts in the project' }
+test = { commands = [
+  'poetry run pytest',
+], description = 'Run smart contract tests' }
+audit = { commands = [
+  'poetry export --without=dev -o requirements.txt',
+  'poetry run pip-audit -r requirements.txt',
+], description = 'Audit with pip-audit' }
+lint = { commands = [
+  'poetry run black --check .',
+  'poetry run ruff .',
+  'poetry run mypy',
+], description = 'Perform linting' }
+audit-teal = { commands = [
+  # 🚨 IMPORTANT 🚨: For strict TEAL validation, remove --exclude statements. The default starter contract is not for production. Ensure thorough testing and adherence to best practices in smart contract development. This is not a replacement for a professional audit.
+  'algokit task analyze smart_contracts/artifacts --recursive --force --exclude rekey-to --exclude is-updatable --exclude missing-fee-check --exclude is-deletable --exclude can-close-asset --exclude can-close-account --exclude unprotected-deletable --exclude unprotected-updatable',
+], description = 'Audit TEAL files' }
 
-[project]
-type = 'contract'
-name = 'production_puya_react-contracts'
+# Commands indented for CI only, prefixed with `ci-` by convention
+ci-teal-diff = { commands = [
+  'git add -N ./smart_contracts/artifacts',
+  'git diff --exit-code --minimal ./smart_contracts/artifacts',
+], description = 'Check TEAL files for differences' }
diff --git a/examples/production_puya_react/projects/production_puya_react-contracts/.copier-answers.yml b/examples/production_puya_react/projects/production_puya_react-contracts/.copier-answers.yml
index 26661a5..77029aa 100644
--- a/examples/production_puya_react/projects/production_puya_react-contracts/.copier-answers.yml
+++ b/examples/production_puya_react/projects/production_puya_react-contracts/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 0.4.0-22-g02dbc45
+_commit: 0.5.1-2-g3b2d772
 _src_path: gh:algorandfoundation/algokit-puya-template
 author_email: None
 author_name: None
diff --git a/examples/production_puya_react/projects/production_puya_react-contracts/README.md b/examples/production_puya_react/projects/production_puya_react-contracts/README.md
index 59e1d54..85bc632 100644
--- a/examples/production_puya_react/projects/production_puya_react-contracts/README.md
+++ b/examples/production_puya_react/projects/production_puya_react-contracts/README.md
@@ -46,7 +46,55 @@ This project has been generated using AlgoKit. See below for default getting sta
 1. If you update to the latest source code and there are new dependencies you will need to run `algokit bootstrap all` again
 2. Follow step 3 above
 
-> For guidance on `smart_contracts` folder and adding new contracts to the project please see [README](smart_contracts/README.md) on the respective folder.
+> For guidance on `smart_contracts` folder and adding new contracts to the project please see [README](smart_contracts/README.md) on the respective folder.### Continuous Integration / Continuous Deployment (CI/CD)
+
+This project uses [GitHub Actions](https://docs.github.com/en/actions/learn-github-actions/understanding-github-actions) to define CI/CD workflows, which are located in the [`.github/workflows`](./.github/workflows) folder.
+
+### Debugging Smart Contracts
+
+This project is optimized to work with AlgoKit AVM Debugger extension. To activate it:
+Refer to the commented header in the `__main__.py` file in the `smart_contracts` folder.
+
+If you have opted in to include VSCode launch configurations in your project, you can also use the `Debug TEAL via AlgoKit AVM Debugger` launch configuration to interactively select an available trace file and launch the debug session for your smart contract.
+
+For information on using and setting up the `AlgoKit AVM Debugger` VSCode extension refer [here](https://github.com/algorandfoundation/algokit-avm-vscode-debugger). To install the extension from the VSCode Marketplace, use the following link: [AlgoKit AVM Debugger extension](https://marketplace.visualstudio.com/items?itemName=algorandfoundation.algokit-avm-vscode-debugger).
+
+#### Setting up GitHub for CI/CD workflow and TestNet deployment
+
+  1. Every time you have a change to your smart contract, and when you first initialize the project you need to [build the contract](#initial-setup) and then commit the `smart_contracts/artifacts` folder so the [output stability](https://github.com/algorandfoundation/algokit-cli/blob/main/docs/articles/output_stability.md) tests pass
+  2. Decide what values you want to use for the `allow_update`, `allow_delete` and the `on_schema_break`, `on_update` parameters specified in [`contract.py`](./smart_contracts/hello_world/contract.py).
+     When deploying to LocalNet these values are both set to allow update and replacement of the app for convenience. But for non-LocalNet networks
+     the defaults are more conservative.
+     These default values will allow the smart contract to be deployed initially, but will not allow the app to be updated or deleted if is changed and the build will instead fail.
+     To help you decide it may be helpful to read the [AlgoKit Utils app deployment documentation](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/docs/capabilities/app-deploy.md) or the [AlgoKit smart contract deployment architecture](https://github.com/algorandfoundation/algokit-cli/blob/main/docs/architecture-decisions/2023-01-12_smart-contract-deployment.md#upgradeable-and-deletable-contracts).
+  3. Create a [Github Environment](https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#creating-an-environment) named `Test`.
+     Note: If you have a private repository and don't have GitHub Enterprise then Environments won't work and you'll need to convert the GitHub Action to use a different approach. Ignore this step if you picked `Starter` preset.
+  4. Create or obtain a mnemonic for an Algorand account for use on TestNet to deploy apps, referred to as the `DEPLOYER` account.
+  5. Store the mnemonic as a [secret](https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#environment-secrets) `DEPLOYER_MNEMONIC`
+     in the Test environment created in step 3.
+  6. The account used to deploy the smart contract will require enough funds to create the app, and also fund it. There are two approaches available here:
+     * Either, ensure the account is funded outside of CI/CD.
+       In Testnet, funds can be obtained by using the [Algorand TestNet dispenser](https://bank.testnet.algorand.network/) and we recommend provisioning 50 ALGOs.
+     * Or, fund the account as part of the CI/CD process by using a `DISPENSER_MNEMONIC` GitHub Environment secret to point to a separate `DISPENSER` account that you maintain ALGOs in (similarly, you need to provision ALGOs into this account using the [TestNet dispenser](https://bank.testnet.algorand.network/)).
+
+#### Continuous Integration
+
+For pull requests and pushes to `main` branch against this repository the following checks are automatically performed by GitHub Actions:
+ - Python dependencies are audited using [pip-audit](https://pypi.org/project/pip-audit/)
+ - Code formatting is checked using [Black](https://github.com/psf/black)
+ - Linting is checked using [Ruff](https://github.com/charliermarsh/ruff)
+ - Types are checked using [mypy](https://mypy-lang.org/)
+ - Python tests are executed using [pytest](https://docs.pytest.org/)
+ - Smart contract artifacts are built
+ - Smart contract artifacts are checked for [output stability](https://github.com/algorandfoundation/algokit-cli/blob/main/docs/articles/output_stability.md)
+ - Smart contract is deployed to a AlgoKit LocalNet instance
+
+#### Continuous Deployment
+
+For pushes to `main` branch, after the above checks pass, the following deployment actions are performed:
+  - The smart contract(s) are deployed to TestNet using [AlgoNode](https://algonode.io).
+
+> Please note deployment is also performed via `algokit deploy` command which can be invoked both via CI as seen on this project, or locally. For more information on how to use `algokit deploy` please see [AlgoKit documentation](https://github.com/algorandfoundation/algokit-cli/blob/main/docs/features/deploy.md).
 
 # Tools
 
diff --git a/examples/production_puya_react/projects/production_puya_react-frontend/.algokit.toml b/examples/production_puya_react/projects/production_puya_react-frontend/.algokit.toml
new file mode 100644
index 0000000..7c4d746
--- /dev/null
+++ b/examples/production_puya_react/projects/production_puya_react-frontend/.algokit.toml
@@ -0,0 +1,21 @@
+[algokit]
+min_version = "v1.3.0b1"
+
+[generate.import_contract]
+description = "Import a typed client from your smart contracts project"
+path = ".algokit/generators/import_contract"
+
+[project]
+type = "frontend"
+name = 'production_puya_react-frontend'
+artifacts = "src/contracts"
+
+[project.run]
+build = { commands = ['npm run build'], description = 'Build frontend' }
+test = { commands = ['npm run test'], description = 'Run frontend tests' }
+lint = { commands = ['npm run lint'], description = 'Lint frontend code' }
+ci-deploy-netlify = { commands = [
+    'npm install --global netlify-cli@latest',
+    'netlify login',
+    'netlify deploy --build --prod'
+  ], description = 'Deploy to Netlify' }
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.copier-answers.yml b/examples/production_puya_react/projects/production_puya_react-frontend/.copier-answers.yml
similarity index 66%
rename from examples/production_puya_react/projects/production_puya_react-app/.copier-answers.yml
rename to examples/production_puya_react/projects/production_puya_react-frontend/.copier-answers.yml
index 3c2a2d9..cc4877f 100644
--- a/examples/production_puya_react/projects/production_puya_react-app/.copier-answers.yml
+++ b/examples/production_puya_react/projects/production_puya_react-frontend/.copier-answers.yml
@@ -1,8 +1,9 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 0.9.4-23-g1e4b544
+_commit: 0.10.1-2-gc6fde70
 _src_path: gh:algorandfoundation/algokit-react-frontend-template
 author_email: None
 author_name: None
+cloud_provider: netlify
 preset_name: production
-project_name: production_puya_react-app
+project_name: production_puya_react-frontend
 
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.editorconfig b/examples/production_puya_react/projects/production_puya_react-frontend/.editorconfig
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/.editorconfig
rename to examples/production_puya_react/projects/production_puya_react-frontend/.editorconfig
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.env.template b/examples/production_puya_react/projects/production_puya_react-frontend/.env.template
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/.env.template
rename to examples/production_puya_react/projects/production_puya_react-frontend/.env.template
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.eslintrc b/examples/production_puya_react/projects/production_puya_react-frontend/.eslintrc
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/.eslintrc
rename to examples/production_puya_react/projects/production_puya_react-frontend/.eslintrc
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.gitattributes b/examples/production_puya_react/projects/production_puya_react-frontend/.gitattributes
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/.gitattributes
rename to examples/production_puya_react/projects/production_puya_react-frontend/.gitattributes
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/.gitignore b/examples/production_puya_react/projects/production_puya_react-frontend/.gitignore
similarity index 95%
rename from examples/starter_puya_react/projects/starter_puya_react-app/.gitignore
rename to examples/production_puya_react/projects/production_puya_react-frontend/.gitignore
index 26dc019..b1ce837 100644
--- a/examples/starter_puya_react/projects/starter_puya_react-app/.gitignore
+++ b/examples/production_puya_react/projects/production_puya_react-frontend/.gitignore
@@ -33,3 +33,6 @@ yarn-error.log*
 !.idea/
 .idea/*
 !.idea/runConfigurations/
+
+.vercel
+.netlify
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.prettierignore b/examples/production_puya_react/projects/production_puya_react-frontend/.prettierignore
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/.prettierignore
rename to examples/production_puya_react/projects/production_puya_react-frontend/.prettierignore
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.prettierrc.cjs b/examples/production_puya_react/projects/production_puya_react-frontend/.prettierrc.cjs
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/.prettierrc.cjs
rename to examples/production_puya_react/projects/production_puya_react-frontend/.prettierrc.cjs
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.vscode/extensions.json b/examples/production_puya_react/projects/production_puya_react-frontend/.vscode/extensions.json
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/.vscode/extensions.json
rename to examples/production_puya_react/projects/production_puya_react-frontend/.vscode/extensions.json
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.vscode/launch.json b/examples/production_puya_react/projects/production_puya_react-frontend/.vscode/launch.json
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/.vscode/launch.json
rename to examples/production_puya_react/projects/production_puya_react-frontend/.vscode/launch.json
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.vscode/settings.json b/examples/production_puya_react/projects/production_puya_react-frontend/.vscode/settings.json
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/.vscode/settings.json
rename to examples/production_puya_react/projects/production_puya_react-frontend/.vscode/settings.json
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.vscode/tasks.json b/examples/production_puya_react/projects/production_puya_react-frontend/.vscode/tasks.json
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/.vscode/tasks.json
rename to examples/production_puya_react/projects/production_puya_react-frontend/.vscode/tasks.json
diff --git a/examples/production_puya_react/projects/production_puya_react-app/LICENSE b/examples/production_puya_react/projects/production_puya_react-frontend/LICENSE
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/LICENSE
rename to examples/production_puya_react/projects/production_puya_react-frontend/LICENSE
diff --git a/examples/production_puya_react/projects/production_puya_react-app/README.md b/examples/production_puya_react/projects/production_puya_react-frontend/README.md
similarity index 61%
rename from examples/production_puya_react/projects/production_puya_react-app/README.md
rename to examples/production_puya_react/projects/production_puya_react-frontend/README.md
index 33889ea..46bf148 100644
--- a/examples/production_puya_react/projects/production_puya_react-app/README.md
+++ b/examples/production_puya_react/projects/production_puya_react-frontend/README.md
@@ -1,4 +1,4 @@
-# production_puya_react-app
+# production_puya_react-frontend
 
 This starter React project has been generated using AlgoKit. See below for default getting started instructions.
 
@@ -31,6 +31,45 @@ This starter React project has been generated using AlgoKit. See below for defau
 
 > Please note, by default frontend is pre configured to run against Algorand LocalNet. If you want to run against TestNet or MainNet, comment out the current environment variable and uncomment the relevant one in [`.env`](.env) file that is created after running bootstrap command and based on [`.env.template`](.env.template).
 
+### Continuous Integration
+
+This project uses [GitHub Actions](https://docs.github.com/en/actions/learn-github-actions/understanding-github-actions) to define CI workflows, which are located in the [`.github/workflows`](./.github/workflows) folder.
+
+For pull requests and pushes to `main` branch against this repository the following checks are automatically performed by GitHub Actions:
+
+- `install`: Installs dependencies using `npm`
+- `lint`: Lints the codebase using `ESLint`
+- `build`: Builds the codebase using `vite`
+
+### Continuous Deployment
+
+The project template provides base Github Actions workflows for continuous deployment to [Netlify](https://www.netlify.com/) or [Vercel](https://vercel.com/). These workflows are located in the [`.github/workflows`](./.github/workflows) folder.
+
+**Please note**: when configuring the github repository for the first time. Depending on selected provider you will need to set the provider secrets in the repository settings. Default setup provided by the template allows you to manage the secrets via environment variables and secrets on your github repository.
+
+
+#### Setting up environment variables and secrets for webapp deployment
+
+For Vercel:
+1. Retrieve your [Vercel Access Token](https://vercel.com/support/articles/how-do-i-use-a-vercel-api-access-token)
+2. Install the [Vercel CLI](https://vercel.com/cli) and run `vercel login`
+3. Inside your folder, run `vercel link` to create a new Vercel project
+4. Inside the generated `.vercel` folder, save the `projectId` and `orgId` from the `project.json`
+5. Inside GitHub, add `VERCEL_TOKEN`, `VERCEL_ORG_ID`, and `VERCEL_PROJECT_ID` as [secrets](https://docs.github.com/en/actions/security-guides/encrypted-secrets).
+6. Create an .env file containing ENV vars for the project (pointing to testnet or mainnet), drag and drop the .env file to upload initial batch of default environment variables to your vercel project.
+7. Upon invocation, CD pipeline will pull the VITE_ prefixed environment variables, build the project and deploy to the specified environment.
+
+For Netlify:
+1. Retrieve your [Netlify Access Token](https://docs.netlify.com/cli/get-started/#obtain-a-token-in-the-netlify-ui)
+2. Inside your folder run `netlify login`
+3. Inside your folder run `netlify sites:create` to create a new site, obtain NETLIFY_SITE_ID from the output
+4. Inside GitHub, add `NETLIFY_AUTH_TOKEN` and `NETLIFY_SITE_ID` as [secrets](https://docs.github.com/en/actions/security-guides/encrypted-secrets).
+5. Create an .env file containing ENV vars for the project (pointing to testnet or mainnet), define the VITE_ prefixed environment variables in netlify environment variables under site settings.
+6. Upon invocation, CD pipeline will build the project and deploy to the specified environment.
+
+> If you prefer alternative deployment methods, you can modify the relevant workflow files from the [`.github/workflows`](./.github/workflows) folder or modify deploy scripts in `.algokit.toml`.
+
+
 # Algorand Wallet integrations
 
 The template comes with [`use-wallet`](https://github.com/txnlab/use-wallet) integration, which provides a React hook for connecting to an Algorand wallet providers. The following wallet providers are included by default:
@@ -58,6 +97,7 @@ This project makes use of React and Tailwind to provider a base project configur
 - [playwright](https://playwright.dev/): Browser automation library
 - [Prettier](https://prettier.io/): Opinionated code formatter
 - [ESLint](https://eslint.org/): Tool for identifying and reporting on patterns in JavaScript
+- Github Actions workflows for build validation
 It has also been configured to have a productive dev experience out of the box in [VS Code](https://code.visualstudio.com/), see the [.vscode](./.vscode) folder.
 # Integrating with smart contracts and application clients
 
diff --git a/examples/production_puya_react/projects/production_puya_react-app/index.html b/examples/production_puya_react/projects/production_puya_react-frontend/index.html
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/index.html
rename to examples/production_puya_react/projects/production_puya_react-frontend/index.html
diff --git a/examples/production_puya_react/projects/production_puya_react-app/jest.config.ts b/examples/production_puya_react/projects/production_puya_react-frontend/jest.config.ts
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/jest.config.ts
rename to examples/production_puya_react/projects/production_puya_react-frontend/jest.config.ts
diff --git a/examples/production_puya_react/projects/production_puya_react-app/package.json b/examples/production_puya_react/projects/production_puya_react-frontend/package.json
similarity index 86%
rename from examples/production_puya_react/projects/production_puya_react-app/package.json
rename to examples/production_puya_react/projects/production_puya_react-frontend/package.json
index 771e023..47b11cd 100644
--- a/examples/production_puya_react/projects/production_puya_react-app/package.json
+++ b/examples/production_puya_react/projects/production_puya_react-frontend/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "production_puya_react-app",
+  "name": "production_puya_react-frontend",
   "version": "0.1.0",
   "author": {
     "name": "None",
@@ -46,9 +46,8 @@
     "tslib": "^2.6.2"
   },
   "scripts": {
-    "generate:app-clients": "algokit generate client -o src/contracts/{contract_name}.ts ../production_puya_react-contracts",
-    "dev": "npm run generate:app-clients && vite",
-    "build": "npm run generate:app-clients && tsc && vite build",
+    "dev": "vite",
+    "build": "tsc && vite build",
     "test": "jest --coverage --passWithNoTests",
     "playwright:test": "playwright test",
     "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
diff --git a/examples/production_puya_react/projects/production_puya_react-app/playwright.config.ts b/examples/production_puya_react/projects/production_puya_react-frontend/playwright.config.ts
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/playwright.config.ts
rename to examples/production_puya_react/projects/production_puya_react-frontend/playwright.config.ts
diff --git a/examples/production_puya_react/projects/production_puya_react-app/postcss.config.cjs b/examples/production_puya_react/projects/production_puya_react-frontend/postcss.config.cjs
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/postcss.config.cjs
rename to examples/production_puya_react/projects/production_puya_react-frontend/postcss.config.cjs
diff --git a/examples/production_puya_react/projects/production_puya_react-app/public/index.html b/examples/production_puya_react/projects/production_puya_react-frontend/public/index.html
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/public/index.html
rename to examples/production_puya_react/projects/production_puya_react-frontend/public/index.html
diff --git a/examples/production_puya_react/projects/production_puya_react-app/public/robots.txt b/examples/production_puya_react/projects/production_puya_react-frontend/public/robots.txt
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/public/robots.txt
rename to examples/production_puya_react/projects/production_puya_react-frontend/public/robots.txt
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/App.tsx b/examples/production_puya_react/projects/production_puya_react-frontend/src/App.tsx
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/App.tsx
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/App.tsx
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/Home.tsx b/examples/production_puya_react/projects/production_puya_react-frontend/src/Home.tsx
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/Home.tsx
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/Home.tsx
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/assets/logo.svg b/examples/production_puya_react/projects/production_puya_react-frontend/src/assets/logo.svg
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/assets/logo.svg
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/assets/logo.svg
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/components/Account.tsx b/examples/production_puya_react/projects/production_puya_react-frontend/src/components/Account.tsx
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/components/Account.tsx
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/components/Account.tsx
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/components/AppCalls.tsx b/examples/production_puya_react/projects/production_puya_react-frontend/src/components/AppCalls.tsx
similarity index 95%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/components/AppCalls.tsx
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/components/AppCalls.tsx
index 6a3338e..1dd2661 100644
--- a/examples/starter_puya_react/projects/starter_puya_react-app/src/components/AppCalls.tsx
+++ b/examples/production_puya_react/projects/production_puya_react-frontend/src/components/AppCalls.tsx
@@ -7,6 +7,7 @@ import { useState } from 'react'
 
 import { HelloWorldClient } from '../contracts/HelloWorld'
 
+import { OnSchemaBreak, OnUpdate } from '@algorandfoundation/algokit-utils/types/app'
 import { getAlgodConfigFromViteEnvironment, getIndexerConfigFromViteEnvironment } from '../utils/network/getAlgoClientConfigs'
 
 interface AppCallsInterface {
@@ -53,8 +54,8 @@ const AppCalls = ({ openModal, setModalState }: AppCallsInterface) => {
     // Given the simplicity of the starter contract, we are deploying it on the frontend
     // for demonstration purposes.
     const deployParams = {
-      onSchemaBreak: 'append',
-      onUpdate: 'append',
+      onSchemaBreak: OnSchemaBreak.AppendApp,
+      onUpdate: OnUpdate.AppendApp,
     }
     await appClient.deploy(deployParams).catch((e: Error) => {
       enqueueSnackbar(`Error deploying the contract: ${e.message}`, { variant: 'error' })
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/components/ConnectWallet.tsx b/examples/production_puya_react/projects/production_puya_react-frontend/src/components/ConnectWallet.tsx
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/components/ConnectWallet.tsx
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/components/ConnectWallet.tsx
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/components/ErrorBoundary.tsx b/examples/production_puya_react/projects/production_puya_react-frontend/src/components/ErrorBoundary.tsx
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/components/ErrorBoundary.tsx
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/components/ErrorBoundary.tsx
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/components/Transact.tsx b/examples/production_puya_react/projects/production_puya_react-frontend/src/components/Transact.tsx
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/components/Transact.tsx
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/components/Transact.tsx
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/contracts/README.md b/examples/production_puya_react/projects/production_puya_react-frontend/src/contracts/README.md
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/contracts/README.md
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/contracts/README.md
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/interfaces/network.ts b/examples/production_puya_react/projects/production_puya_react-frontend/src/interfaces/network.ts
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/interfaces/network.ts
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/interfaces/network.ts
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/main.tsx b/examples/production_puya_react/projects/production_puya_react-frontend/src/main.tsx
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/main.tsx
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/main.tsx
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/styles/main.css b/examples/production_puya_react/projects/production_puya_react-frontend/src/styles/main.css
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/styles/main.css
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/styles/main.css
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/utils/ellipseAddress.spec.tsx b/examples/production_puya_react/projects/production_puya_react-frontend/src/utils/ellipseAddress.spec.tsx
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/utils/ellipseAddress.spec.tsx
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/utils/ellipseAddress.spec.tsx
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/utils/ellipseAddress.ts b/examples/production_puya_react/projects/production_puya_react-frontend/src/utils/ellipseAddress.ts
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/utils/ellipseAddress.ts
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/utils/ellipseAddress.ts
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/utils/network/getAlgoClientConfigs.ts b/examples/production_puya_react/projects/production_puya_react-frontend/src/utils/network/getAlgoClientConfigs.ts
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/utils/network/getAlgoClientConfigs.ts
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/utils/network/getAlgoClientConfigs.ts
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/vite-env.d.ts b/examples/production_puya_react/projects/production_puya_react-frontend/src/vite-env.d.ts
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/src/vite-env.d.ts
rename to examples/production_puya_react/projects/production_puya_react-frontend/src/vite-env.d.ts
diff --git a/examples/production_puya_react/projects/production_puya_react-app/tailwind.config.js b/examples/production_puya_react/projects/production_puya_react-frontend/tailwind.config.js
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/tailwind.config.js
rename to examples/production_puya_react/projects/production_puya_react-frontend/tailwind.config.js
diff --git a/examples/production_puya_react/projects/production_puya_react-app/tests/example.spec.ts b/examples/production_puya_react/projects/production_puya_react-frontend/tests/example.spec.ts
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/tests/example.spec.ts
rename to examples/production_puya_react/projects/production_puya_react-frontend/tests/example.spec.ts
diff --git a/examples/production_puya_react/projects/production_puya_react-app/tsconfig.json b/examples/production_puya_react/projects/production_puya_react-frontend/tsconfig.json
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/tsconfig.json
rename to examples/production_puya_react/projects/production_puya_react-frontend/tsconfig.json
diff --git a/examples/production_puya_react/projects/production_puya_react-app/tsconfig.node.json b/examples/production_puya_react/projects/production_puya_react-frontend/tsconfig.node.json
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/tsconfig.node.json
rename to examples/production_puya_react/projects/production_puya_react-frontend/tsconfig.node.json
diff --git a/examples/production_puya_react/projects/production_puya_react-app/vite.config.ts b/examples/production_puya_react/projects/production_puya_react-frontend/vite.config.ts
similarity index 100%
rename from examples/production_puya_react/projects/production_puya_react-app/vite.config.ts
rename to examples/production_puya_react/projects/production_puya_react-frontend/vite.config.ts
diff --git a/examples/starter_puya_react/.algokit.toml b/examples/starter_puya_react/.algokit.toml
index 378317e..b0ad929 100644
--- a/examples/starter_puya_react/.algokit.toml
+++ b/examples/starter_puya_react/.algokit.toml
@@ -4,3 +4,6 @@ min_version = "v1.12.0"
 [project]
 type = 'workspace'
 projects_root_path = 'projects'
+
+[project.run]
+build = ['starter_puya_react-contracts', 'starter_puya_react-frontend']
diff --git a/examples/starter_puya_react/README.md b/examples/starter_puya_react/README.md
index eb4e4bb..ee0d65c 100644
--- a/examples/starter_puya_react/README.md
+++ b/examples/starter_puya_react/README.md
@@ -16,7 +16,7 @@ This starter full stack project has been generated using AlgoKit. See below for
    - Run `algokit localnet start` to start a local Algorand network in Docker. If you are using VS Code launch configurations provided by the template, this will be done automatically for you.
 3. Open the project and start debugging / developing on:
    - [starter_puya_react-contracts](projects/starter_puya_react-contracts/README.md) - Refer to the README for more information on how to work with smart contracts.
-   - [starter_puya_react-app](projects/starter_puya_react-app/README.md) - Refer to the README for more information on how to work with the frontend application.
+   - [starter_puya_react-frontend](projects/starter_puya_react-frontend/README.md) - Refer to the README for more information on how to work with the frontend application.
 
 
 ### Subsequently
@@ -38,10 +38,10 @@ It has also been configured to have a productive dev experience out of the box i
 
 ## Integrating with smart contracts and application clients
 
-Refer to the [starter_puya_react-contracts](projects/starter_puya_react-contracts/README.md) folder for overview of working with smart contracts, [projects/starter_puya_react-app](projects/starter_puya_react-app/README.md) for overview of the React project and the [projects/starter_puya_react-app/contracts](projects/starter_puya_react-app/src/contracts/README.md) folder for README on adding new smart contracts from backend as application clients on your frontend. The templates provided in these folders will help you get started.
-When you compile and generate smart contract artifacts, your frontend component will automatically generate typescript application clients from smart contract artifacts and move them to `frontend/src/contracts` folder, see [`generate:app-clients` in package.json](projects/starter_puya_react-app/package.json). Afterwards, you are free to import and use them in your frontend application.
+Refer to the [starter_puya_react-contracts](projects/starter_puya_react-contracts/README.md) folder for overview of working with smart contracts, [projects/starter_puya_react-frontend](projects/starter_puya_react-frontend/README.md) for overview of the React project and the [projects/starter_puya_react-frontend/contracts](projects/starter_puya_react-frontend/src/contracts/README.md) folder for README on adding new smart contracts from backend as application clients on your frontend. The templates provided in these folders will help you get started.
+When you compile and generate smart contract artifacts, your frontend component will automatically generate typescript application clients from smart contract artifacts and move them to `frontend/src/contracts` folder, see [`generate:app-clients` in package.json](projects/starter_puya_react-frontend/package.json). Afterwards, you are free to import and use them in your frontend application.
 
-The frontend starter also provides an example of interactions with your HelloWorldClient in [`AppCalls.tsx`](projects/starter_puya_react-app/src/components/AppCalls.tsx) component by default.
+The frontend starter also provides an example of interactions with your HelloWorldClient in [`AppCalls.tsx`](projects/starter_puya_react-frontend/src/components/AppCalls.tsx) component by default.
 
 ## Next Steps
 
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/.algokit.toml b/examples/starter_puya_react/projects/starter_puya_react-app/.algokit.toml
deleted file mode 100644
index 80bf4c4..0000000
--- a/examples/starter_puya_react/projects/starter_puya_react-app/.algokit.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[algokit]
-min_version = "v1.3.0b1"
-
-[generate.import_contract]
-description = "Import a typed client from your smart contracts project"
-path = ".algokit/generators/import_contract"
-
-[project]
-type = "frontend"
-name = "starter_puya_react-app"
diff --git a/examples/starter_puya_react/projects/starter_puya_react-contracts/.algokit.toml b/examples/starter_puya_react/projects/starter_puya_react-contracts/.algokit.toml
index fbd8f65..31909eb 100644
--- a/examples/starter_puya_react/projects/starter_puya_react-contracts/.algokit.toml
+++ b/examples/starter_puya_react/projects/starter_puya_react-contracts/.algokit.toml
@@ -1,19 +1,38 @@
 [algokit]
 min_version = "v1.8.0"
 
-[deploy]
+[generate.smart_contract]
+description = "Adds new smart contract to existing project"
+path = ".algokit/generators/create_contract"
+
+[project]
+type = 'contract'
+name = 'starter_puya_react-contracts'
+artifacts = 'smart_contracts/artifacts'
+
+[project.deploy]
 command = "npm run deploy:ci"
 environment_secrets = [
   "DEPLOYER_MNEMONIC",
 ]
 
-[deploy.localnet]
+[project.deploy.localnet]
 environment_secrets = []
 
-[generate.smart_contract]
-description = "Adds new smart contract to existing project"
-path = ".algokit/generators/create_contract"
+[project.run]
+# Commands intented for use locally and in CI
+build = { commands = [ 
+  'npm run build',
+], description = 'Build all smart contracts in the project' }
+lint = { commands = [
+], description = 'Perform linting' }
+audit-teal = { commands = [
+  # 🚨 IMPORTANT 🚨: For strict TEAL validation, remove --exclude statements. The default starter contract is not for production. Ensure thorough testing and adherence to best practices in smart contract development. This is not a replacement for a professional audit.
+  'algokit task analyze smart_contracts/artifacts --recursive --force --exclude rekey-to --exclude is-updatable --exclude missing-fee-check --exclude is-deletable --exclude can-close-asset --exclude can-close-account --exclude unprotected-deletable --exclude unprotected-updatable',
+], description = 'Audit TEAL files' }
 
-[project]
-type = 'contract'
-name = 'starter_puya_react-contracts'
+# Commands indented for CI only, prefixed with `ci-` by convention
+ci-teal-diff = { commands = [
+  'git add -N ./smart_contracts/artifacts',
+  'git diff --exit-code --minimal ./smart_contracts/artifacts',
+], description = 'Check TEAL files for differences' }
diff --git a/examples/starter_puya_react/projects/starter_puya_react-contracts/.copier-answers.yml b/examples/starter_puya_react/projects/starter_puya_react-contracts/.copier-answers.yml
index 636f195..942c727 100644
--- a/examples/starter_puya_react/projects/starter_puya_react-contracts/.copier-answers.yml
+++ b/examples/starter_puya_react/projects/starter_puya_react-contracts/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 0.4.0-22-g02dbc45
+_commit: 0.5.1-2-g3b2d772
 _src_path: gh:algorandfoundation/algokit-puya-template
 author_email: None
 author_name: None
diff --git a/examples/starter_puya_react/projects/starter_puya_react-contracts/.vscode/extensions.json b/examples/starter_puya_react/projects/starter_puya_react-contracts/.vscode/extensions.json
index 684e4dd..e5ca4ca 100644
--- a/examples/starter_puya_react/projects/starter_puya_react-contracts/.vscode/extensions.json
+++ b/examples/starter_puya_react/projects/starter_puya_react-contracts/.vscode/extensions.json
@@ -1,9 +1,6 @@
 {
   "recommendations": [
     "ms-python.python",
-    "charliermarsh.ruff",
-    "matangover.mypy",
-    "ms-python.black-formatter",
     "esbenp.prettier-vscode",
     "tamasfe.even-better-toml",
     "editorconfig.editorconfig",
diff --git a/examples/starter_puya_react/projects/starter_puya_react-contracts/.vscode/settings.json b/examples/starter_puya_react/projects/starter_puya_react-contracts/.vscode/settings.json
index af8031f..dfae20d 100644
--- a/examples/starter_puya_react/projects/starter_puya_react-contracts/.vscode/settings.json
+++ b/examples/starter_puya_react/projects/starter_puya_react-contracts/.vscode/settings.json
@@ -24,26 +24,8 @@
       // Prevent default import sorting from running; Ruff will sort imports for us anyway
       "source.organizeImports": false
     },
-    "editor.defaultFormatter": "ms-python.black-formatter",
+    "editor.defaultFormatter": null,
     },
-  "black-formatter.args": ["--config=pyproject.toml"],
-  "ruff.enable": true,
-  "ruff.lint.run": "onSave",
-  "ruff.lint.args": ["--config=pyproject.toml"],
-  "ruff.importStrategy": "fromEnvironment",
-  "ruff.fixAll": true, //lint and fix all files in workspace
-  "ruff.organizeImports": true, //organize imports on save
-  "ruff.codeAction.disableRuleComment": {
-    "enable": true
-  },
-  "ruff.codeAction.fixViolation": {
-    "enable": true
-  },
-  "python.analysis.typeCheckingMode": "off",
-  "mypy.configFile": "pyproject.toml",
-  // set to empty array to use config from project
-  "mypy.targets": [],
-  "mypy.runUsingActiveInterpreter": true,
   
   // On Windows, if execution policy is set to Signed (default) then it won't be able to activate the venv
   //  so instead let's set it to RemoteSigned for VS Code terminal
diff --git a/examples/starter_puya_react/projects/starter_puya_react-contracts/README.md b/examples/starter_puya_react/projects/starter_puya_react-contracts/README.md
index 92bc1c2..f42a1af 100644
--- a/examples/starter_puya_react/projects/starter_puya_react-contracts/README.md
+++ b/examples/starter_puya_react/projects/starter_puya_react-contracts/README.md
@@ -58,10 +58,7 @@ This project makes use of Python to build Algorand smart contracts. The followin
 - [Puya](https://github.com/algorand-foundation/puya) - Smart contract development framework for developing Algorand smart contracts in pure Python; [docs](https://github.com/algorandfoundation/puya), [examples](https://github.com/algorandfoundation/puya/tree/main/examples)
 - [PyTEAL](https://github.com/algorand/pyteal) - Python language binding for Algorand smart contracts; [docs](https://pyteal.readthedocs.io/en/stable/)
 - [AlgoKit Utils](https://github.com/algorandfoundation/algokit-utils-ts) - A set of core Algorand utilities that make it easier to build solutions on Algorand.
-- [Poetry](https://python-poetry.org/): Python packaging and dependency management.- [Black](https://github.com/psf/black): A Python code formatter.- [Ruff](https://github.com/charliermarsh/ruff): An extremely fast Python linter.
-
-- [mypy](https://mypy-lang.org/): Static type checker.
-- [pip-audit](https://pypi.org/project/pip-audit/): Tool for scanning Python environments for packages with known vulnerabilities.
+- [Poetry](https://python-poetry.org/): Python packaging and dependency management.
 - [npm](https://www.npmjs.com/): Node.js package manager
 - [TypeScript](https://www.typescriptlang.org/): Strongly typed programming language that builds on JavaScript
 - [ts-node-dev](https://github.com/wclr/ts-node-dev): TypeScript development execution environment
diff --git a/examples/starter_puya_react/projects/starter_puya_react-contracts/pyproject.toml b/examples/starter_puya_react/projects/starter_puya_react-contracts/pyproject.toml
index d1cb4fb..1aad27e 100644
--- a/examples/starter_puya_react/projects/starter_puya_react-contracts/pyproject.toml
+++ b/examples/starter_puya_react/projects/starter_puya_react-contracts/pyproject.toml
@@ -12,33 +12,8 @@ python-dotenv = "^1.0.0"
 puya = "^0"
 
 [tool.poetry.group.dev.dependencies]
-black = {extras = ["d"], version = "*"}
-ruff = "^0.1.6"
-mypy = "*"
-pip-audit = "*"
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.ruff]
-line-length = 120
-select = ["E", "F", "ANN", "UP", "N", "C4", "B", "A", "YTT", "W", "FBT", "Q", "RUF", "I"]
-ignore = [
-  "ANN101", # no type for self
-  "ANN102", # no type for cls
-]
-unfixable = ["B", "RUF"]
-
-[tool.ruff.flake8-annotations]
-allow-star-arg-any = true
-suppress-none-returning = true
-
-[tool.mypy]
-files = "smart_contracts/"
-python_version = "3.12"
-check_untyped_defs = true
-warn_redundant_casts = true
-warn_unused_ignores = true
-allow_untyped_defs = false
-strict_equality = true
diff --git a/examples/starter_puya_react/projects/starter_puya_react-frontend/.algokit.toml b/examples/starter_puya_react/projects/starter_puya_react-frontend/.algokit.toml
new file mode 100644
index 0000000..c54e5b3
--- /dev/null
+++ b/examples/starter_puya_react/projects/starter_puya_react-frontend/.algokit.toml
@@ -0,0 +1,15 @@
+[algokit]
+min_version = "v1.3.0b1"
+
+[generate.import_contract]
+description = "Import a typed client from your smart contracts project"
+path = ".algokit/generators/import_contract"
+
+[project]
+type = "frontend"
+name = 'starter_puya_react-frontend'
+artifacts = "src/contracts"
+
+[project.run]
+build = { commands = ['npm run build'], description = 'Build frontend' }
+test = { commands = ['npm run test'], description = 'Run frontend tests' }
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/.copier-answers.yml b/examples/starter_puya_react/projects/starter_puya_react-frontend/.copier-answers.yml
similarity index 73%
rename from examples/starter_puya_react/projects/starter_puya_react-app/.copier-answers.yml
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/.copier-answers.yml
index 026f78f..6d674f6 100644
--- a/examples/starter_puya_react/projects/starter_puya_react-app/.copier-answers.yml
+++ b/examples/starter_puya_react/projects/starter_puya_react-frontend/.copier-answers.yml
@@ -1,8 +1,8 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: 0.9.4-23-g1e4b544
+_commit: 0.10.1-2-gc6fde70
 _src_path: gh:algorandfoundation/algokit-react-frontend-template
 author_email: None
 author_name: None
 preset_name: starter
-project_name: starter_puya_react-app
+project_name: starter_puya_react-frontend
 
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/.env.template b/examples/starter_puya_react/projects/starter_puya_react-frontend/.env.template
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/.env.template
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/.env.template
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/.gitattributes b/examples/starter_puya_react/projects/starter_puya_react-frontend/.gitattributes
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/.gitattributes
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/.gitattributes
diff --git a/examples/production_puya_react/projects/production_puya_react-app/.gitignore b/examples/starter_puya_react/projects/starter_puya_react-frontend/.gitignore
similarity index 95%
rename from examples/production_puya_react/projects/production_puya_react-app/.gitignore
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/.gitignore
index 26dc019..b1ce837 100644
--- a/examples/production_puya_react/projects/production_puya_react-app/.gitignore
+++ b/examples/starter_puya_react/projects/starter_puya_react-frontend/.gitignore
@@ -33,3 +33,6 @@ yarn-error.log*
 !.idea/
 .idea/*
 !.idea/runConfigurations/
+
+.vercel
+.netlify
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/.vscode/extensions.json b/examples/starter_puya_react/projects/starter_puya_react-frontend/.vscode/extensions.json
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/.vscode/extensions.json
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/.vscode/extensions.json
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/.vscode/launch.json b/examples/starter_puya_react/projects/starter_puya_react-frontend/.vscode/launch.json
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/.vscode/launch.json
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/.vscode/launch.json
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/.vscode/settings.json b/examples/starter_puya_react/projects/starter_puya_react-frontend/.vscode/settings.json
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/.vscode/settings.json
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/.vscode/settings.json
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/.vscode/tasks.json b/examples/starter_puya_react/projects/starter_puya_react-frontend/.vscode/tasks.json
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/.vscode/tasks.json
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/.vscode/tasks.json
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/LICENSE b/examples/starter_puya_react/projects/starter_puya_react-frontend/LICENSE
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/LICENSE
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/LICENSE
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/README.md b/examples/starter_puya_react/projects/starter_puya_react-frontend/README.md
similarity index 99%
rename from examples/starter_puya_react/projects/starter_puya_react-app/README.md
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/README.md
index f8cc993..9fce5e8 100644
--- a/examples/starter_puya_react/projects/starter_puya_react-app/README.md
+++ b/examples/starter_puya_react/projects/starter_puya_react-frontend/README.md
@@ -1,4 +1,4 @@
-# starter_puya_react-app
+# starter_puya_react-frontend
 
 This starter React project has been generated using AlgoKit. See below for default getting started instructions.
 
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/index.html b/examples/starter_puya_react/projects/starter_puya_react-frontend/index.html
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/index.html
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/index.html
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/package.json b/examples/starter_puya_react/projects/starter_puya_react-frontend/package.json
similarity index 81%
rename from examples/starter_puya_react/projects/starter_puya_react-app/package.json
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/package.json
index d0fbe65..7d52c5e 100644
--- a/examples/starter_puya_react/projects/starter_puya_react-app/package.json
+++ b/examples/starter_puya_react/projects/starter_puya_react-frontend/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "starter_puya_react-app",
+  "name": "starter_puya_react-frontend",
   "version": "0.1.0",
   "author": {
     "name": "None",
@@ -34,9 +34,8 @@
     "tslib": "^2.6.2"
   },
   "scripts": {
-    "generate:app-clients": "algokit generate client -o src/contracts/{contract_name}.ts ../starter_puya_react-contracts",
-    "dev": "npm run generate:app-clients && vite",
-    "build": "npm run generate:app-clients && tsc && vite build",
+    "dev": "vite",
+    "build": "tsc && vite build",
     "preview": "vite preview"
   },
   "eslintConfig": {
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/public/index.html b/examples/starter_puya_react/projects/starter_puya_react-frontend/public/index.html
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/public/index.html
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/public/index.html
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/public/robots.txt b/examples/starter_puya_react/projects/starter_puya_react-frontend/public/robots.txt
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/public/robots.txt
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/public/robots.txt
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/App.tsx b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/App.tsx
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/App.tsx
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/App.tsx
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/Home.tsx b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/Home.tsx
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/Home.tsx
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/Home.tsx
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/assets/logo.svg b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/assets/logo.svg
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/assets/logo.svg
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/assets/logo.svg
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/components/Account.tsx b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/components/Account.tsx
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/components/Account.tsx
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/components/Account.tsx
diff --git a/examples/production_puya_react/projects/production_puya_react-app/src/components/AppCalls.tsx b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/components/AppCalls.tsx
similarity index 95%
rename from examples/production_puya_react/projects/production_puya_react-app/src/components/AppCalls.tsx
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/components/AppCalls.tsx
index 6a3338e..1dd2661 100644
--- a/examples/production_puya_react/projects/production_puya_react-app/src/components/AppCalls.tsx
+++ b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/components/AppCalls.tsx
@@ -7,6 +7,7 @@ import { useState } from 'react'
 
 import { HelloWorldClient } from '../contracts/HelloWorld'
 
+import { OnSchemaBreak, OnUpdate } from '@algorandfoundation/algokit-utils/types/app'
 import { getAlgodConfigFromViteEnvironment, getIndexerConfigFromViteEnvironment } from '../utils/network/getAlgoClientConfigs'
 
 interface AppCallsInterface {
@@ -53,8 +54,8 @@ const AppCalls = ({ openModal, setModalState }: AppCallsInterface) => {
     // Given the simplicity of the starter contract, we are deploying it on the frontend
     // for demonstration purposes.
     const deployParams = {
-      onSchemaBreak: 'append',
-      onUpdate: 'append',
+      onSchemaBreak: OnSchemaBreak.AppendApp,
+      onUpdate: OnUpdate.AppendApp,
     }
     await appClient.deploy(deployParams).catch((e: Error) => {
       enqueueSnackbar(`Error deploying the contract: ${e.message}`, { variant: 'error' })
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/components/ConnectWallet.tsx b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/components/ConnectWallet.tsx
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/components/ConnectWallet.tsx
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/components/ConnectWallet.tsx
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/components/ErrorBoundary.tsx b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/components/ErrorBoundary.tsx
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/components/ErrorBoundary.tsx
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/components/ErrorBoundary.tsx
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/components/Transact.tsx b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/components/Transact.tsx
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/components/Transact.tsx
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/components/Transact.tsx
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/contracts/README.md b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/contracts/README.md
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/contracts/README.md
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/contracts/README.md
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/interfaces/network.ts b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/interfaces/network.ts
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/interfaces/network.ts
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/interfaces/network.ts
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/main.tsx b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/main.tsx
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/main.tsx
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/main.tsx
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/styles/App.css b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/styles/App.css
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/styles/App.css
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/styles/App.css
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/utils/ellipseAddress.ts b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/utils/ellipseAddress.ts
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/utils/ellipseAddress.ts
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/utils/ellipseAddress.ts
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/utils/network/getAlgoClientConfigs.ts b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/utils/network/getAlgoClientConfigs.ts
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/utils/network/getAlgoClientConfigs.ts
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/utils/network/getAlgoClientConfigs.ts
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/src/vite-env.d.ts b/examples/starter_puya_react/projects/starter_puya_react-frontend/src/vite-env.d.ts
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/src/vite-env.d.ts
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/src/vite-env.d.ts
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/tsconfig.json b/examples/starter_puya_react/projects/starter_puya_react-frontend/tsconfig.json
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/tsconfig.json
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/tsconfig.json
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/tsconfig.node.json b/examples/starter_puya_react/projects/starter_puya_react-frontend/tsconfig.node.json
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/tsconfig.node.json
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/tsconfig.node.json
diff --git a/examples/starter_puya_react/projects/starter_puya_react-app/vite.config.ts b/examples/starter_puya_react/projects/starter_puya_react-frontend/vite.config.ts
similarity index 100%
rename from examples/starter_puya_react/projects/starter_puya_react-app/vite.config.ts
rename to examples/starter_puya_react/projects/starter_puya_react-frontend/vite.config.ts
diff --git a/examples/starter_puya_react/starter_puya_react.code-workspace b/examples/starter_puya_react/starter_puya_react.code-workspace
index 707795a..f8b1fef 100644
--- a/examples/starter_puya_react/starter_puya_react.code-workspace
+++ b/examples/starter_puya_react/starter_puya_react.code-workspace
@@ -8,7 +8,7 @@
       "path": "./projects/starter_puya_react-contracts"
     },
     {
-      "path": "./projects/starter_puya_react-app"
+      "path": "./projects/starter_puya_react-frontend"
     }
   ],
   "settings": {
@@ -61,7 +61,7 @@
             "name": "Deploy contracts",
             "folder": "starter_puya_react-contracts"
           },
-          { "name": "Run dApp", "folder": "starter_puya_react-app" }
+          { "name": "Run dApp", "folder": "starter_puya_react-frontend" }
         ],
         "presentation": {
           "hidden": false,
diff --git a/tests/test_templates.py b/tests/test_templates.py
index e3d9af3..6c5451d 100644
--- a/tests/test_templates.py
+++ b/tests/test_templates.py
@@ -317,6 +317,7 @@ def get_answered_questions_from_copier_yaml(
 @pytest.mark.parametrize(
     "contract_template", ["puya"]
 )  # ["tealscript", "puya", "beaker"])
+# TODO: revert upon tealscript and beaker supporting latest
 def test_production_preset(contract_template: str, working_dir: Path) -> None:
     response = run_init(
         working_dir,
@@ -335,6 +336,7 @@ def test_production_preset(contract_template: str, working_dir: Path) -> None:
 @pytest.mark.parametrize(
     "contract_template", ["puya"]
 )  # ["tealscript", "puya", "beaker"])
+# TODO: revert upon tealscript and beaker supporting latest
 def test_starter_preset(contract_template: str, working_dir: Path) -> None:
     response = run_init(
         working_dir,