diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7e17ec93..ce814ba1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         runs-on: ["ubuntu-latest"] # can add windows-latest, macos-latest
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
         include:
           # Include one that runs in the dev environment
           - runs-on: "ubuntu-latest"
diff --git a/Dockerfile b/Dockerfile
index e0f5626d..8244c0d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,3 @@
-<<<<<<< before updating
 ##### build stage ##############################################################
 
 ARG TARGET_ARCHITECTURE
@@ -7,21 +6,6 @@ ARG REGISTRY=ghcr.io/epics-containers
 
 FROM  ${REGISTRY}/epics-base-linux-developer:${BASE} AS developer
 ARG PIP_OPTIONS=.
-=======
-# The devcontainer should use the developer target and run as root with podman
-# or docker with user namespaces.
-ARG PYTHON_VERSION=3.11
-FROM python:${PYTHON_VERSION} as developer
-
-# Add any system dependencies for the developer/build environment here
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    graphviz \
-    && 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
->>>>>>> after updating
 
 # The build stage installs the context into the venv
 FROM developer as build
@@ -29,7 +13,6 @@ COPY . /context
 WORKDIR /context
 RUN pip install .
 
-<<<<<<< before updating
 # install python package into /venv
 RUN pip install ${PIP_OPTIONS}
 
@@ -48,12 +31,5 @@ FROM ${REGISTRY}/epics-base-linux-runtime:${BASE} AS runtime
 COPY --from=runtime_prep /assets /
 
 ENV TARGET_ARCHITECTURE linux
-=======
-# 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 --from=build /venv/ /venv/
-ENV PATH=/venv/bin:$PATH
->>>>>>> after updating
 
 ENTRYPOINT ["/bin/bash"]
diff --git a/pyproject.toml b/pyproject.toml
index fcdf0fc3..5a15afe8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,8 +23,8 @@ dependencies = [
 ] # Add project dependencies here, e.g. ["click", "numpy"]
 dynamic = ["version"]
 license.file = "LICENSE"
-readme = "README.rst"
-requires-python = ">=3.8"
+readme = "README.md"
+requires-python = ">=3.10"
 
 [project.optional-dependencies]
 dev = [