diff --git a/images/beancount-import/Dockerfile b/images/beancount-import/Dockerfile
index 15e5cd7..c0b7fcb 100644
--- a/images/beancount-import/Dockerfile
+++ b/images/beancount-import/Dockerfile
@@ -21,4 +21,4 @@ EXPOSE 8080
 VOLUME ${BEANCOUNT_IMPORT_DATA_DIR}
 VOLUME ${BEANCOUNT_IMPORT_JOURNAL_DIR}
 
-CMD python3 /beancount-import/run.py --address 0.0.0.0 --port 8080 ${BEANCOUNT_IMPORT_ARGS}
+CMD [ "python3", "/beancount-import/run.py", "--address", "0.0.0.0", "--port", "8080", "${BEANCOUNT_IMPORT_ARGS}" ]
diff --git a/images/beancount-import/requirements.txt b/images/beancount-import/requirements.txt
index 4ffd9a2..33c2bb0 100644
--- a/images/beancount-import/requirements.txt
+++ b/images/beancount-import/requirements.txt
@@ -1,2 +1,5 @@
+# beancount-import doesn't specify this constraint itself, but is also
+# not compatible with v3. So we need to ensure this here.
+beancount<3.0.0
 beancount-import==1.4.0
 smart_importer==0.5