diff --git a/docker/Dockerfile b/docker/Dockerfile
index ec8109a..ae52a68 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -41,7 +41,7 @@ RUN pip install aprsd==$APRSD_PIP_VERSION
 # Ensure /config is there with a default config file
 USER root
 RUN mkdir -p /config
-RUN aprsd sample-config > /config/aprsd.yml
+RUN aprsd sample-config > /config/aprsd.conf
 RUN chown -R $APRS_USER:$APRS_USER /config
 
 # override this to run another configuration
@@ -53,4 +53,4 @@ ADD bin/run.sh /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/run.sh"]
 
 HEALTHCHECK --interval=5m --timeout=12s --start-period=30s \
-    CMD aprsd healthcheck --config /config/aprsd.yml --url http://localhost:8001/stats
+    CMD aprsd healthcheck --config /config/aprsd.conf --url http://localhost:8001/stats
diff --git a/docker/Dockerfile-dev b/docker/Dockerfile-dev
index f1a9dc0..76ce948 100644
--- a/docker/Dockerfile-dev
+++ b/docker/Dockerfile-dev
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM ubuntu:focal as aprsd
+FROM ubuntu:22.04
 
 # Dockerfile for building a container during aprsd development.
 ARG BRANCH=master
@@ -55,7 +55,7 @@ RUN ls -al /usr/local/bin
 RUN ls -al /usr/bin
 RUN which aprsd
 RUN mkdir -p /config
-RUN aprsd sample-config > /config/aprsd.yml
+RUN aprsd sample-config > /config/aprsd.conf
 RUN chown -R $APRS_USER:$APRS_USER /config
 
 # override this to run another configuration
@@ -67,4 +67,4 @@ ADD bin/run.sh $HOME/
 ENTRYPOINT ["/home/aprs/run.sh"]
 
 HEALTHCHECK --interval=5m --timeout=12s --start-period=30s \
-    CMD aprsd healthcheck --config /config/aprsd.yml --url http://localhost:8001/stats
+    CMD aprsd healthcheck --config /config/aprsd.conf --url http://localhost:8001/stats