diff --git a/docker-compose.yml b/docker-compose.yml
index 3faba88cf..130e7f0c2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     build:
       context: .
       dockerfile: ./docker/Dockerfile
-    image: h2o-python:0.58
+    image: h2o-python:0.59
     tty: true
     command: bash
     environment:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7ce68e896..845ae316d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -8,15 +8,13 @@ ENV LANG=C.UTF-8 \
 
 RUN apt-get update && apt-get install -y nano postgresql-client
 
+ARG BUILDARCH
+
 # pin node version -- see https://github.com/nodesource/distributions/issues/33
-RUN curl -o nodejs.deb https://deb.nodesource.com/node_12.x/pool/main/n/nodejs/nodejs_12.13.1-1nodesource1_amd64.deb \
+RUN curl -o nodejs.deb https://deb.nodesource.com/node_12.x/pool/main/n/nodejs/nodejs_12.13.1-1nodesource1_${BUILDARCH}.deb \
     && dpkg -i ./nodejs.deb \
     && rm nodejs.deb
 
-# Install Pandoc, for export
-RUN wget https://github.com/jgm/pandoc/releases/download/2.14.2/pandoc-2.14.2-1-amd64.deb \
-    && dpkg -i pandoc-2.14.2-1-amd64.deb
-
 RUN mkdir -p /app/web
 WORKDIR /app/web
 
diff --git a/docker/pandoc-lambda/Dockerfile b/docker/pandoc-lambda/Dockerfile
index 6625f8dff..cdb363596 100644
--- a/docker/pandoc-lambda/Dockerfile
+++ b/docker/pandoc-lambda/Dockerfile
@@ -22,9 +22,11 @@ COPY entrypoint.sh /
 RUN chmod 755 /usr/local/bin/aws-lambda-rie /entrypoint.sh
 EXPOSE 8080
 
+ARG BUILDARCH
+
 # Install Pandoc
-RUN wget https://github.com/jgm/pandoc/releases/download/2.14.2/pandoc-2.14.2-1-amd64.deb \
-    && dpkg -i pandoc-2.14.2-1-amd64.deb
+RUN wget https://github.com/jgm/pandoc/releases/download/2.14.2/pandoc-2.14.2-1-${BUILDARCH}.deb \
+    && dpkg -i pandoc-2.14.2-1-${BUILDARCH}.deb
 
 # Install the python requirements, including the AWS Lambda runtime interface client
 COPY function/requirements.txt .