diff --git a/armada/handlers/schema.py b/armada/handlers/schema.py
index f37f1735..2f2c0219 100644
--- a/armada/handlers/schema.py
+++ b/armada/handlers/schema.py
@@ -14,8 +14,8 @@
 
 import os
 import re
+from importlib.resources import files
 
-import pkg_resources
 import yaml
 
 # Types
@@ -57,7 +57,7 @@ def _get_schema_info(name, data):
 
 
 def _get_schema_dir():
-    return pkg_resources.resource_filename('armada', 'schemas')
+    return str(files('armada') / 'schemas')
 
 
 def _load_schemas():
diff --git a/images/armada/Dockerfile.ubuntu_jammy b/images/armada/Dockerfile.ubuntu_jammy
index d86e6bc0..21e4eeab 100644
--- a/images/armada/Dockerfile.ubuntu_jammy
+++ b/images/armada/Dockerfile.ubuntu_jammy
@@ -4,8 +4,8 @@
 # 429 Too Many Requests - Server message: too many requests:
 #   You have reached your pull rate limit.
 #   You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit
-ARG FROM=public.ecr.aws/docker/library/ubuntu:jammy
-ARG ARMADA_GO=quay.io/airshipit/armada-go:latest-ubuntu_focal
+ARG FROM=quay.io/airshipit/ubuntu:jammy
+ARG ARMADA_GO=quay.io/airshipit/armada-go:latest-ubuntu_jammy
 FROM ${ARMADA_GO} AS armada_go
 FROM ${FROM}