diff --git a/docker/solver/Dockerfile b/docker/solver/Dockerfile
index a8098493c..66e297df6 100644
--- a/docker/solver/Dockerfile
+++ b/docker/solver/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt -y update && apt install -y apt-utils && \
diff --git a/docker/webservice/Dockerfile b/docker/webservice/Dockerfile
index 6820b6942..3b4d8250d 100644
--- a/docker/webservice/Dockerfile
+++ b/docker/webservice/Dockerfile
@@ -22,14 +22,15 @@ WORKDIR /src/astrometry/net
 
 RUN ln -sf settings_test.py settings.py
 
-ENV PYTHONPATH /src:${PYTHONPATH}
+ENV PYTHONPATH=/src:${PYTHONPATH}
 
 RUN mkdir appsecrets && \
     touch appsecrets/__init__.py && \
     touch appsecrets/auth.py && \
     cp appsecrets-example/django.py appsecrets
 
-COPY docker/webservice/django_db.py appsecrets/
+#COPY docker/webservice/django_db.py appsecrets/
+COPY django_db.py appsecrets/
 #RUN (echo -n "DJANGO_SECRET_KEY = '"; tr -dc A-Za-z0-9 </dev/urandom | head -c 52; echo "'") > /src/astrometry/net/appsecrets/django.py
 
 RUN mv migrations/* /tmp && \