diff --git a/Dockerfile.nipapd b/Dockerfile.nipapd
index 14d7fe265..0b1f8b2cb 100644
--- a/Dockerfile.nipapd
+++ b/Dockerfile.nipapd
@@ -48,8 +48,9 @@ RUN apt-get update -qy && apt-get upgrade -qy \
     python-all \
     python-docutils \
     python-pip \
+    python3-pip \
     python-dev \
- && pip --no-input install envtpl \
+ && pip3 --no-input install envtpl \
  && rm -rf /var/lib/apt/lists/*
 
 
diff --git a/Dockerfile.www b/Dockerfile.www
index 0957f3a6e..d82efb850 100644
--- a/Dockerfile.www
+++ b/Dockerfile.www
@@ -42,8 +42,9 @@ RUN apt-get update -qy && apt-get upgrade -qy \
     python-all \
     python-docutils \
     python-pip \
+    python3-pip \
     python-dev \
- && pip --no-input install envtpl \
+ && pip3 --no-input install envtpl \
  && rm -rf /var/lib/apt/lists/*
 
 # Install pynipap, nipap and nipap-www
diff --git a/nipap-www/requirements.txt b/nipap-www/requirements.txt
index 473c7cf9b..abdec5de8 100644
--- a/nipap-www/requirements.txt
+++ b/nipap-www/requirements.txt
@@ -1,3 +1,11 @@
+# The following requirements are indirect, but needed in order to survive in
+# a world where Python 3 is the default
+decorator<4.0.0
+beautifulsoup4<=4.9.3
+PasteDeploy<3.0.0
+mako<1.2
+waitress<2.0.0
+# End of indirects
 Pylons>=1.0
 Jinja2
 pynipap
diff --git a/nipap/requirements.txt b/nipap/requirements.txt
index a842c7ffb..af8741f40 100644
--- a/nipap/requirements.txt
+++ b/nipap/requirements.txt
@@ -1,4 +1,4 @@
-Flask==1.1.2
+Flask==1.1.*
 Flask-Compress==1.9.0
 Flask-XML-RPC==0.1.2
 Flask-RESTful==0.3.8