diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 10bf765..393bd66 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,7 +1,10 @@
 // For format details, see https://containers.dev/implementors/json_reference/
 {
     "name": "Python 3 Developer Container",
-    "image": "python:3.11",
+    "build": {
+        "dockerfile": "../Dockerfile",
+        "target": "developer"
+    },
     "remoteEnv": {
          // Allow X11 apps to run inside the container
         "DISPLAY": "${localEnv:DISPLAY}",
@@ -25,7 +28,7 @@
         "ghcr.io/devcontainers/features/common-utils:2": {
             "upgradePackages": false
         }
-    },    
+    },
     "runArgs": [
         // Allow the container to access the host X11 display and EPICS CA
         "--net=host",
diff --git a/.github/actions/install_requirements/action.yml b/.github/actions/install_requirements/action.yml
index 79d1a71..df9d0cd 100644
--- a/.github/actions/install_requirements/action.yml
+++ b/.github/actions/install_requirements/action.yml
@@ -1,60 +1,34 @@
 name: Install requirements
-description: Run pip install with requirements and upload resulting requirements
+description: Install a version of python then call pip install and report what was installed
 inputs:
-  requirements_file:
-    description: Name of requirements file to use and upload
-    required: true
-  install_options:
+  python-version:
+    description: Python version to install, default is from Dockerfile
+    default: "dev"
+  pip-install:
     description: Parameters to pass to pip install
-    required: true
-  artifact_name:
-    description: A user friendly name to give the produced artifacts
-    required: true
-  python_version:
-    description: Python version to install
-    default: "3.x"
+    default: "-c requirements/dev-constraints.txt -e .[dev]"
 
 runs:
   using: composite
-
   steps:
+    - name: Get version of python
+      run: |
+        PYTHON_VERSION="${{ inputs.python-version }}"
+        if [ $PYTHON_VERSION == "dev" ]; then
+          PYTHON_VERSION=$(sed -n "s/ARG PYTHON_VERSION=//p" Dockerfile)
+        fi
+        echo "PYTHON_VERSION=$PYTHON_VERSION" >> "$GITHUB_ENV"
+      shell: bash
+
     - name: Setup python
       uses: actions/setup-python@v5
       with:
-        python-version: ${{ inputs.python_version }}
+        python-version: ${{ env.PYTHON_VERSION }}
 
-    - name: Pip install
-      run: |
-        touch ${{ inputs.requirements_file }}
-        # -c uses requirements.txt as constraints, see 'Validate requirements file'
-        pip install -c ${{ inputs.requirements_file }} ${{ inputs.install_options }}
+    - name: Install packages
+      run: pip install ${{ inputs.pip-install }}
       shell: bash
 
-    - name: Create lockfile
-      run: |
-        mkdir -p lockfiles
-        pip freeze --exclude-editable > lockfiles/${{ inputs.requirements_file }}
-        # delete the self referencing line and make sure it isn't blank
-        sed -i'' -e '/file:/d' lockfiles/${{ inputs.requirements_file }}
-      shell: bash
-
-    - name: Upload lockfiles
-      uses: actions/upload-artifact@v4.0.0
-      with:
-        name: lockfiles-${{ inputs.python_version }}-${{ inputs.artifact_name }}-${{ github.sha }}
-        path: lockfiles
-
-    # This eliminates the class of problems where the requirements being given no
-    # longer match what the packages themselves dictate. E.g. In the rare instance
-    # where I install some-package which used to depend on vulnerable-dependency
-    # but now uses good-dependency (despite being nominally the same version)
-    # pip will install both if given a requirements file with -r
-    - name: If requirements file exists, check it matches pip installed packages
-      run: |
-        if [ -s ${{ inputs.requirements_file }} ]; then
-          if ! diff -u ${{ inputs.requirements_file }} lockfiles/${{ inputs.requirements_file }}; then
-            echo "Error: ${{ inputs.requirements_file }} need the above changes to be exhaustive"
-            exit 1
-          fi
-        fi
+    - name: Report what was installed
+      run: pip freeze
       shell: bash
diff --git a/.github/workflows/_container.yml b/.github/workflows/_container.yml
new file mode 100644
index 0000000..4857ee9
--- /dev/null
+++ b/.github/workflows/_container.yml
@@ -0,0 +1,56 @@
+on:
+  workflow_call:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          # Need this to get version number from last tag
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub Docker Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and export to Docker local cache
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          # Need load and tags so we can test it below
+          load: true
+          tags: tag_for_testing
+
+      - name: Test cli works in cached runtime image
+        run: docker run --rm tag_for_testing --version
+
+      - name: Create tags for publishing image
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tags: |
+            type=ref,event=tag
+            type=raw,value=latest
+
+      - name: Push cached image to container registry
+        if: github.ref_type == 'tag'
+        uses: docker/build-push-action@v5
+        # This does not build the image again, it will find the image in the
+        # Docker cache and publish it
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/_dist.yml b/.github/workflows/_dist.yml
new file mode 100644
index 0000000..cf81127
--- /dev/null
+++ b/.github/workflows/_dist.yml
@@ -0,0 +1,36 @@
+on:
+  workflow_call:
+
+jobs:
+  build:
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          # Need this to get version number from last tag
+          fetch-depth: 0
+
+      - name: Build sdist and wheel
+        run: >
+          export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) &&
+          pipx run build
+
+      - name: Upload sdist and wheel as artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: dist
+
+      - name: Check for packaging errors
+        run: pipx run twine check --strict dist/*
+
+      - name: Install produced wheel
+        uses: ./.github/actions/install_requirements
+        with:          
+          pip-install: dist/*.whl
+
+      - name: Test module --version works using the installed wheel
+        # If more than one module in src/ replace with module name to test
+        run: python -m $(ls src | head -1) --version
diff --git a/.github/workflows/docs.yml b/.github/workflows/_docs.yml
similarity index 64%
rename from .github/workflows/docs.yml
rename to .github/workflows/_docs.yml
index 6aba66b..0a9dc3f 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/_docs.yml
@@ -1,19 +1,11 @@
-name: Docs CI
-
 on:
-  push:
-  pull_request:
+  workflow_call:
 
 jobs:
-  docs:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
+  build:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Avoid git conflicts when tag and branch pushed at same time
-        if: startsWith(github.ref, 'refs/tags')
-        run: sleep 60
-
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -26,18 +18,24 @@ jobs:
 
       - name: Install python packages
         uses: ./.github/actions/install_requirements
-        with:
-          requirements_file: requirements-dev-3.x.txt
-          install_options: -e .[dev]
-          artifact_name: docs
 
       - name: Build docs
         run: tox -e docs
 
+      - name: Upload built docs artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: docs
+          path: build
+
       - name: Move to versioned directory
         run: mv build/html .github/pages/main
 
-      - name: Upload artifact
+      - name: Add other releases
+        run: echo Not done yet
+
+      - name: Upload github-pages artifact
+        if: github.ref_name == 'main'
         uses: actions/upload-pages-artifact@v3
         with:
           path: .github/pages
@@ -49,12 +47,13 @@ jobs:
     permissions:
       contents: read
       pages: write
-      id-token: write  
+      id-token: write
     environment:
       name: github-pages
-      url: ${{steps.deployment.outputs.page_url}}
+      url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
-    needs: docs
+    needs: build
+    if: github.ref_name == 'main'
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
diff --git a/.github/workflows/_lint.yml b/.github/workflows/_lint.yml
new file mode 100644
index 0000000..78df55c
--- /dev/null
+++ b/.github/workflows/_lint.yml
@@ -0,0 +1,16 @@
+on:
+  workflow_call:
+
+jobs:
+  run:
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install python packages
+        uses: ./.github/actions/install_requirements
+
+      - name: Lint
+        run: tox -e pre-commit,pyright
diff --git a/.github/workflows/_pypi.yml b/.github/workflows/_pypi.yml
new file mode 100644
index 0000000..87eba79
--- /dev/null
+++ b/.github/workflows/_pypi.yml
@@ -0,0 +1,16 @@
+on:
+  workflow_call:
+
+jobs:
+  upload:
+    runs-on: ubuntu-latest
+    environment: release
+
+    steps:
+      - name: Download dist artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: dist
+
+      - name: Publish to PyPI using trusted publishing
+        uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/_release.yml b/.github/workflows/_release.yml
new file mode 100644
index 0000000..11aa311
--- /dev/null
+++ b/.github/workflows/_release.yml
@@ -0,0 +1,21 @@
+on:
+  workflow_call:
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+
+      - name: Create GitHub Release
+        # We pin to the SHA, not the tag, for security reasons.
+        # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
+        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v0.1.15
+        with:
+          prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
+          files: "*"
+          generate_release_notes: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
new file mode 100644
index 0000000..55d9740
--- /dev/null
+++ b/.github/workflows/_test.yml
@@ -0,0 +1,46 @@
+on:
+  workflow_call:
+    inputs:
+      python-version:
+        type: string
+        description: The version of python to install
+        required: true
+      runs-on:
+        type: string
+        description: The runner to run this job on
+        required: true
+
+env:
+  # https://github.com/pytest-dev/pytest/issues/2042
+  PY_IGNORE_IMPORTMISMATCH: "1"
+
+jobs:
+  run:
+    runs-on: ${{ inputs.runs-on }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - if: inputs.python-version == 'dev'
+        name: Install dev constrained python packages
+        uses: ./.github/actions/install_requirements
+
+      - if: inputs.python-version != 'dev'
+        name: Install unconstrained python packages
+        uses: ./.github/actions/install_requirements
+        with:
+          python-version: ${{ inputs.python-version }}
+          pip-install: ".[dev]"
+
+      - name: Report dependencies
+        run: pipdeptree
+
+      - name: Run tests
+        run: tox -e pytest-cov
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          name: ${{ inputs.python-version }}/${{ inputs.runs-on }}
+          files: cov.xml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..147a30b
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,55 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  lint:
+    # pull requests are a duplicate of a branch push if within the same repo.
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
+    uses: ./.github/workflows/_lint.yml
+
+  test:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
+    strategy:
+      matrix:
+        runs-on: ["ubuntu-latest", "windows-latest", "macos-latest"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        include:
+          # Include one that runs in the dev environment
+          - runs-on: "ubuntu-latest"
+            python-version: "dev"
+      fail-fast: false
+    uses: ./.github/workflows/_test.yml
+    with:
+      runs-on: ${{ matrix.runs-on }}
+      python-version: ${{ matrix.python-version }}
+
+  dist:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
+    uses: ./.github/workflows/_dist.yml
+
+  container:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
+    uses: ./.github/workflows/_container.yml
+    permissions:
+      packages: write
+
+  docs:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
+    uses: ./.github/workflows/_docs.yml
+    permissions:
+      pages: write
+      id-token: write
+      contents: read
+
+  pypi:
+    needs: dist
+    if: github.ref_type == 'tag'
+    uses: ./.github/workflows/_pypi.yml
+
+  release:
+    needs: [dist, docs]
+    if: github.ref_type == 'tag'
+    uses: ./.github/workflows/_release.yml
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
deleted file mode 100644
index 7779722..0000000
--- a/.github/workflows/code.yml
+++ /dev/null
@@ -1,243 +0,0 @@
-name: Code CI
-
-on:
-  push:
-  pull_request:
-env:
-  # The target python version, which must match the Dockerfile version
-  CONTAINER_PYTHON: "3.11"
-  DIST_WHEEL_PATH: dist-${{ github.sha }}
-
-jobs:
-  lint:
-    # pull requests are a duplicate of a branch push if within the same repo.
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install python packages
-        uses: ./.github/actions/install_requirements
-        with:
-          requirements_file: requirements-dev-3.x.txt
-          install_options: -e .[dev]
-          artifact_name: lint
-
-      - name: Lint
-        run: tox -e pre-commit,pyright
-
-  test:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ["ubuntu-latest"] # can add windows-latest, macos-latest
-        python: ["3.8", "3.9", "3.10", "3.11"]
-        install: ["-e .[dev]"]
-        # Make one version be non-editable to test both paths of version code
-        include:
-          - os: "ubuntu-latest"
-            python: "3.7"
-            install: ".[dev]"
-
-    runs-on: ${{ matrix.os }}
-    env:
-      # https://github.com/pytest-dev/pytest/issues/2042
-      PY_IGNORE_IMPORTMISMATCH: "1"
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          # Need this to get version number from last tag
-          fetch-depth: 0
-
-      - name: Install python packages
-        uses: ./.github/actions/install_requirements
-        with:
-          python_version: ${{ matrix.python }}
-          requirements_file: requirements-test-${{ matrix.os }}-${{ matrix.python }}.txt
-          install_options: ${{ matrix.install }}
-          artifact_name: tests
-
-      - name: List dependency tree
-        run: pipdeptree
-
-      - name: Run tests
-        run: tox -e pytest-cov
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          name: ${{ matrix.python }}/${{ matrix.os }}
-          files: cov.xml
-
-  dist:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
-    runs-on: "ubuntu-latest"
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          # Need this to get version number from last tag
-          fetch-depth: 0
-
-      - name: Build sdist and wheel
-        run: |
-          export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) && \
-          pipx run build
-
-      - name: Upload sdist and wheel as artifacts
-        uses: actions/upload-artifact@v4.0.0
-        with:
-          name: ${{ env.DIST_WHEEL_PATH }}
-          path: dist
-
-      - name: Check for packaging errors
-        run: pipx run twine check --strict dist/*
-
-      - name: Install python packages
-        uses: ./.github/actions/install_requirements
-        with:
-          python_version: ${{env.CONTAINER_PYTHON}}
-          requirements_file: requirements.txt
-          install_options: dist/*.whl
-          artifact_name: dist
-
-      - name: Test module --version works using the installed wheel
-        # If more than one module in src/ replace with module name to test
-        run: python -m $(ls src | head -1) --version
-
-  container:
-    needs: [lint, dist, test]
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      packages: write
-
-    env:
-      TEST_TAG: "testing"
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      # image names must be all lower case
-      - name: Generate image repo name
-        run: echo IMAGE_REPOSITORY=ghcr.io/$(tr '[:upper:]' '[:lower:]' <<< "${{ github.repository }}") >> $GITHUB_ENV
-
-      - name: Set lockfile location in environment
-        run: |
-          echo "DIST_LOCKFILE_PATH=lockfiles-${{ env.CONTAINER_PYTHON }}-dist-${{ github.sha }}" >> $GITHUB_ENV
-
-      - name: Download wheel and lockfiles
-        uses: actions/download-artifact@v4.1.0
-        with:
-          path: artifacts/
-          pattern: "*dist*"
-
-      - name: Log in to GitHub Docker Registry
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and export to Docker local cache
-        uses: docker/build-push-action@v5
-        with:
-          # Note build-args, context, file, and target must all match between this
-          # step and the later build-push-action, otherwise the second build-push-action
-          # will attempt to build the image again
-          build-args: |
-            PIP_OPTIONS=-r ${{ env.DIST_LOCKFILE_PATH }}/requirements.txt ${{ env.DIST_WHEEL_PATH }}/*.whl
-          context: artifacts/
-          file: ./Dockerfile
-          target: runtime
-          load: true
-          tags: ${{ env.TEST_TAG }}
-          # If you have a long docker build (2+ minutes), uncomment the
-          # following to turn on caching. For short build times this
-          # makes it a little slower
-          #cache-from: type=gha
-          #cache-to: type=gha,mode=max
-
-      - name: Test cli works in cached runtime image
-        run: docker run docker.io/library/${{ env.TEST_TAG }} --version
-
-      - name: Create tags for publishing image
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.IMAGE_REPOSITORY }}
-          tags: |
-            type=ref,event=tag
-            type=raw,value=latest, enable=${{ github.ref_type == 'tag' }}
-          # type=edge,branch=main
-          # Add line above to generate image for every commit to given branch,
-          # and uncomment the end of if clause in next step
-
-      - name: Push cached image to container registry
-        if: github.ref_type == 'tag' # || github.ref_name == 'main'
-        uses: docker/build-push-action@v5
-        # This does not build the image again, it will find the image in the
-        # Docker cache and publish it
-        with:
-          # Note build-args, context, file, and target must all match between this
-          # step and the previous build-push-action, otherwise this step will
-          # attempt to build the image again
-          build-args: |
-            PIP_OPTIONS=-r ${{ env.DIST_LOCKFILE_PATH }}/requirements.txt ${{ env.DIST_WHEEL_PATH }}/*.whl
-          context: artifacts/
-          file: ./Dockerfile
-          target: runtime
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  release:
-    # upload to PyPI and make a release on every tag
-    needs: [lint, dist, test]
-    if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
-    runs-on: ubuntu-latest
-    env:
-      HAS_PYPI_TOKEN: ${{ secrets.PYPI_TOKEN != '' }}
-
-    steps:
-      - name: Download wheel and lockfiles
-        uses: actions/download-artifact@v4.1.0
-        with:
-          path: artifacts/
-          pattern: "*dist*"
-
-      - name: Fixup blank lockfiles
-        # Github release artifacts can't be blank
-        run: for f in ${{ env.DIST_LOCKFILE_PATH }}/*; do [ -s $f ] || echo '# No requirements' >> $f; done
-
-      - name: Github Release
-        # We pin to the SHA, not the tag, for security reasons.
-        # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
-        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v0.1.15
-        with:
-          prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
-          files: |
-            ${{ env.DIST_WHEEL_PATH }}/*
-            ${{ env.DIST_LOCKFILE_PATH }}/*
-          generate_release_notes: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Publish to PyPI
-        if: ${{ env.HAS_PYPI_TOKEN }}
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_TOKEN }}
diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml
index 7f651a2..b08e86f 100644
--- a/.github/workflows/linkcheck.yml
+++ b/.github/workflows/linkcheck.yml
@@ -16,13 +16,6 @@ jobs:
 
       - name: Install python packages
         uses: ./.github/actions/install_requirements
-        with:
-          requirements_file: requirements-dev-3.x.txt
-          install_options: -e .[dev]
-          artifact_name: link_check
 
       - name: Check links
         run: tox -e docs build -- -b linkcheck
-
-      - name: Keepalive Workflow
-        uses: gautamkrishnar/keepalive-workflow@v1
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0571b5f..88ee1fb 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,8 +4,8 @@
     "[python]": {
       "editor.formatOnSave": true,
       "editor.codeActionsOnSave": {
-        "source.fixAll": true,
-        "source.organizeImports": true
+        "source.fixAll": "explicit",
+        "source.organizeImports": "explicit"
       },
       "editor.defaultFormatter": "charliermarsh.ruff"
     }
diff --git a/Dockerfile b/Dockerfile
index df70c53..a85c428 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,34 +1,26 @@
 # This file is for use as a devcontainer and a runtime container
 #
-# The devcontainer should use the build target and run as root with podman
+# The devcontainer should use the developer target and run as root with podman
 # or docker with user namespaces.
-#
-FROM python:3.11 as build
-
-ARG PIP_OPTIONS=.
-
+ARG PYTHON_VERSION=3.11
+FROM python:${PYTHON_VERSION} as developer
 # Add any system dependencies for the developer/build environment here e.g.
 # RUN apt-get update && apt-get upgrade -y && \
 #     apt-get install -y --no-install-recommends \
 #     desired-packages \
 #     && rm -rf /var/lib/apt/lists/*
-
-# set up a virtual environment and put it in PATH
 RUN python -m venv /venv
 ENV PATH=/venv/bin:$PATH
 
-# Copy any required context for the pip install over
+# The build stage installs the context into the venv
+FROM developer as build
 COPY . /context
-WORKDIR /context
-
-# install python package into /venv
-RUN pip install ${PIP_OPTIONS}
-
-FROM python:3.11-slim as runtime
+RUN ls -a /context
+RUN pip install /context
 
+# The runtime stage copies the built venv into a slim runtime container
+FROM python:${PYTHON_VERSION}-slim as runtime
 # Add apt-get system dependecies for runtime here if needed
-
-# copy the virtual environment from the build stage and put it in PATH
 COPY --from=build /venv/ /venv/
 ENV PATH=/venv/bin:$PATH
 
diff --git a/requirements/dev-constraints.txt b/requirements/dev-constraints.txt
new file mode 100644
index 0000000..8a5b6e4
--- /dev/null
+++ b/requirements/dev-constraints.txt
@@ -0,0 +1,54 @@
+accessible-pygments==0.0.4
+alabaster==0.7.16
+Babel==2.14.0
+beautifulsoup4==4.12.2
+certifi==2023.11.17
+cfgv==3.4.0
+charset-normalizer==3.3.2
+colorama==0.4.6
+coverage==7.4.0
+distlib==0.3.8
+docutils==0.20.1
+filelock==3.13.1
+identify==2.5.33
+idna==3.6
+imagesize==1.4.1
+iniconfig==2.0.0
+Jinja2==3.1.3
+livereload==2.6.3
+MarkupSafe==2.1.3
+nodeenv==1.8.0
+packaging==23.2
+pathlib2==2.3.7.post1
+pipdeptree==2.13.2
+platformdirs==4.1.0
+pluggy==1.3.0
+pre-commit==3.6.0
+py==1.11.0
+pydata-sphinx-theme==0.15.1
+Pygments==2.17.2
+pyright==1.1.347
+pytest==7.4.4
+pytest-cov==4.1.0
+PyYAML==6.0.1
+requests==2.31.0
+ruff==0.1.13
+six==1.16.0
+snowballstemmer==2.2.0
+soupsieve==2.5
+Sphinx==7.2.6
+sphinx-autobuild==2021.3.14
+sphinx-copybutton==0.5.2
+sphinx_design==0.5.0
+sphinxcontrib-applehelp==1.0.8
+sphinxcontrib-devhelp==1.0.6
+sphinxcontrib-htmlhelp==2.0.5
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==1.0.7
+sphinxcontrib-serializinghtml==1.1.10
+tornado==6.4
+tox==3.28.0
+tox-direct==0.4
+typing_extensions==4.9.0
+urllib3==2.1.0
+virtualenv==20.25.0