diff --git a/DEVELOPER.md b/DEVELOPER.md
index 0303114..bc40df9 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -3,7 +3,7 @@
 
 ## Building a testing deb
 
-Manually edit `./src/debian/changelog` and add a new entry/change the version in the top-most entry to a distinct version. Run `make package_bionic` where bionic is the Ubuntu codename you want to test on. Afterwards you'll have a new .deb file in `dist/`.
+Manually edit `./src/debian/changelog` and add a new entry/change the version in the top-most entry to a distinct version. Run `make package_jammy`. Afterwards you'll have a new .deb file in `dist/`.
 
 ## Releasing
 
@@ -13,4 +13,4 @@ We pin the nerve-tools version in puppet hieradata, so you can roll out new vers
 
 ## Testing
 
-Run `make itest_bionic` where bionic is the Ubuntu distribution to test for.
+Run `make itest_jammy`.
diff --git a/Makefile b/Makefile
index 3276a1a..870c948 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ RELEASE = v$(VERSION)
 LAST_COMMIT_MSG = $(shell git log -1 --pretty=%B | sed -e 's/\x27/"/g')
 .PHONY: release
 release:
-	dch -v $(VERSION) --distribution bionic --changelog src/debian/changelog '$(LAST_COMMIT_MSG)'
+	dch -v $(VERSION) --distribution jammy --changelog src/debian/changelog '$(LAST_COMMIT_MSG)'
 	git ci -am 'Released $(VERSION) via make release'
 	git tag $(RELEASE) master
 	git show
diff --git a/dockerfiles/bionic/Dockerfile b/dockerfiles/bionic/Dockerfile
deleted file mode 100644
index b1e1b39..0000000
--- a/dockerfiles/bionic/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-FROM ubuntu:bionic
-
-ARG PIP_INDEX_URL=https://pypi.yelpcorp.com/simple
-ENV PIP_INDEX_URL=$PIP_INDEX_URL
-
-# Need Python 3.7 for nerve-tools
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends software-properties-common && \
-    add-apt-repository ppa:deadsnakes/ppa
-
-RUN apt-get update && apt-get -y install \
-    build-essential \
-    cargo \
-    curl \
-    debhelper \
-    dpkg-dev \
-    host \
-    libcurl4-openssl-dev \
-    libffi-dev \
-    libssl-dev \
-    libyaml-dev \
-    libzookeeper-mt-dev \
-    protobuf-compiler \
-    python3.7-dev \
-    python3.7-distutils \
-    rustc \
-    virtualenv \
-    wget
-
-RUN wget http://archive.ubuntu.com/ubuntu/pool/universe/d/dh-virtualenv/dh-virtualenv_1.2.2-1.1build1_all.deb && \
-    dpkg --force-all -i dh-virtualenv_1.2.2-1.1build1_all.deb
-
-# Preferred method to install pip when not bundled with python - https://pip.pypa.io/en/stable/installing/
-RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-RUN python3.7 get-pip.py
-RUN pip install -U tox pip virtualenv setuptools
-
-ADD location_types.json /nail/etc/services/
-ADD location_mapping.json /nail/etc/services/
-
-WORKDIR /work
diff --git a/dockerfiles/bionic/docker-compose.yml b/dockerfiles/bionic/docker-compose.yml
deleted file mode 100644
index c5a2633..0000000
--- a/dockerfiles/bionic/docker-compose.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: '2.4'
-services:
-  bionic:
-    build: ../../dockerfiles/bionic
-    command: bash -c "cp -R /code/* /work && cd /work/src && tox -e py37-linux && dpkg-buildpackage -d -uc -us && mv ../*.deb /dist"
-    volumes:
-      - ../..:/code:ro
-      - ../../dist:/dist
diff --git a/dockerfiles/itest/docker-compose-bionic.yml b/dockerfiles/itest/docker-compose-bionic.yml
deleted file mode 100644
index 6dceb76..0000000
--- a/dockerfiles/itest/docker-compose-bionic.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-version: '2.4'
-services:
-  itest:
-    build: ../../dockerfiles/itest/itest_bionic
-    environment:
-      SSH_AUTH_SOCK: ${SSH_AUTH_SOCK}
-    hostname: itesthost.itestdomain
-    volumes:
-     - ../..:/work
-     - "${SSH_AUTH_SOCK}:${SSH_AUTH_SOCK}"
-    links:
-     - servicethree
-     - serviceone
-     - scribe
-     - zookeeper
-
-  servicethree:
-    # Create dummy service listening on port 1024 that returns /status
-    image: python:3-alpine
-    command:  /bin/sh -c "echo OK > status && python3 -m http.server 1024"
-
-  serviceone:
-    # Create dummy service listening on port 1025
-    image: alpine/socat:latest
-    command: TCP4-LISTEN:1025,fork /dev/null
-
-  scribe:
-    # Create dummy scribe listening on port 1464
-    image: alpine/socat:latest
-    command: TCP4-LISTEN:1464,fork /dev/null
-
-  zookeeper:
-    image: zookeeper:3.5
diff --git a/dockerfiles/itest/itest/Dockerfile.bionic b/dockerfiles/itest/itest/Dockerfile.bionic
deleted file mode 100644
index 511df15..0000000
--- a/dockerfiles/itest/itest/Dockerfile.bionic
+++ /dev/null
@@ -1,53 +0,0 @@
-FROM ubuntu:bionic
-
-ARG PIP_INDEX_URL=https://pypi.yelpcorp.com/simple
-ENV PIP_INDEX_URL=$PIP_INDEX_URL
-
-RUN apt-get update && apt-get -y install \
-    python-setuptools \
-    python3-setuptools \
-    python3-pytest \
-    python3-kazoo \
-    socat \
-    ruby ruby-dev zlib1g-dev \
-    libcurl3 \
-    python3.7 \
-    python3-pip \
-    git \
-    libyaml-dev \
-    libc6-dev \
-    libstdc++6 \
-    wget
-
-RUN pip3 install pip==9.0.1
-
-# Install nerve
-ADD nerve_Gemfile Gemfile
-RUN gem install --no-ri --no-rdoc bundler -v 2.3.27
-
-RUN mkdir -p /opt/nerve
-RUN bundle install --gemfile=/Gemfile
-RUN bundle binstubs nerve --path /usr/bin
-
-RUN pip3 install zope.interface
-
-ADD nerve.conf /etc/init/nerve.conf
-ADD nerve.conf /etc/init/nerve-backup.conf
-ADD nerve.conf.json /etc/nerve/nerve.conf.json
-ADD yelpsoa-configs /nail/etc/services
-ADD puppet_services.d /etc/nerve/puppet_services.d
-ADD zookeeper_discovery /nail/etc/zookeeper_discovery
-
-ADD ecosystem /nail/etc/ecosystem
-ADD superregion /nail/etc/superregion
-ADD region /nail/etc/region
-ADD habitat /nail/etc/habitat
-
-# configure_nerve tries to restart nerve.
-# make it think it succeeded.
-RUN ln -sf /bin/true /usr/sbin/service
-
-ADD itest.py /itest.py
-ADD run_itest.sh /run_itest.sh
-
-CMD /bin/bash /run_itest.sh
diff --git a/tox.ini b/tox.ini
index 476316b..66fb3c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,18 +14,6 @@ setenv =
     TZ = UTC
     PIP_INDEX_URL = {env:PIP_INDEX_URL:https://pypi.yelpcorp.com/simple}
 
-[testenv:package_bionic]
-allowlist_externals = cp
-setenv =
-    COMPOSE_FILE = dockerfiles/bionic/docker-compose.yml
-commands =
-    cp dockerfiles/itest/itest/yelpsoa-configs/location_mapping.json dockerfiles/itest/itest/yelpsoa-configs/location_types.json dockerfiles/bionic/
-    docker-compose down
-    docker-compose --verbose build --no-cache --build-arg PIP_INDEX_URL={env:PIP_INDEX_URL:https://pypi.yelpcorp.com/simple}
-    docker-compose run bionic
-    docker-compose stop
-    docker-compose rm --force
-
 [testenv:package_jammy]
 allowlist_externals = cp
 setenv =
@@ -39,18 +27,6 @@ commands =
     docker-compose stop
     docker-compose rm --force
 
-[testenv:itest_bionic]
-setenv =
-    COMPOSE_PROJECT_NAME=nerve_tools_bionic
-    COMPOSE_FILE = dockerfiles/itest/docker-compose-bionic.yml
-    SSH_AUTH_SOCK={env:SSH_AUTH_SOCK}
-commands =
-    docker-compose down
-    docker-compose --verbose build --no-cache --build-arg PIP_INDEX_URL={env:PIP_INDEX_URL:https://pypi.yelpcorp.com/simple}
-    docker-compose run itest
-    docker-compose stop
-    docker-compose rm --force
-
 [testenv:itest_jammy]
 setenv =
     COMPOSE_PROJECT_NAME=nerve_tools_jammy