diff --git a/.cirrus.yml b/.cirrus.yml
index dfbabcee0..2f97d619d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -47,7 +47,7 @@ build_task:
   #script:
     ## https://cirrus-ci.org/guide/writing-tasks/#artifacts-instruction
     #- wget https://api.cirrus-ci.com/v1/artifact/github/$CIRRUS_REPO_FULL_NAME/build/binaries/bin/postgrest
-    #- tar cjf postgrest-$CIRRUS_TAG-freebsd.tar.xz postgrest
+    #- tar cvJf postgrest-$CIRRUS_TAG-freebsd.tar.xz -C ~/project/result/bin postgrest
     ### The CIRRUS_RELEASE env var is not the same as the tag. It's an id for the release.
     #- curl -X POST --data-binary @$NAME \
       #-H "Authorization:token ${TOKEN}" \
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 26aba3e0c..b2d6d0611 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,23 +1,18 @@
 # To build use:
 # docker build --build-arg POSTGREST_VERSION=<v5.2.0 or another version> -t postgrest ./docker/
+# docker build --build-arg POSTGREST_VERSION=v7.0.1 -t postgrest ./docker/
 
 FROM debian:buster-slim
 
 ARG POSTGREST_VERSION
 
-# Install libpq5
-RUN apt-get -qq update && \
-    apt-get -qq install -y --no-install-recommends libpq5 && \
-    apt-get -qq clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
 # Install postgrest
 RUN BUILD_DEPS="curl ca-certificates xz-utils" && \
     apt-get -qq update && \
     apt-get -qq install -y --no-install-recommends $BUILD_DEPS && \
     cd /tmp && \
-    curl -SLO https://github.com/PostgREST/postgrest/releases/download/${POSTGREST_VERSION}/postgrest-${POSTGREST_VERSION}-ubuntu.tar.xz && \
-    tar -xJvf postgrest-${POSTGREST_VERSION}-ubuntu.tar.xz && \
+    curl -SLO https://github.com/PostgREST/postgrest/releases/download/${POSTGREST_VERSION}/postgrest-${POSTGREST_VERSION}-linux-x64-static.tar.xz && \
+    tar -xJvf postgrest-${POSTGREST_VERSION}-linux-x64-static.tar.xz && \
     mv postgrest /usr/local/bin/postgrest && \
     cd / && \
     apt-get -qq purge --auto-remove -y $BUILD_DEPS && \
@@ -26,7 +21,6 @@ RUN BUILD_DEPS="curl ca-certificates xz-utils" && \
 
 COPY postgrest.conf /etc/postgrest.conf
 
-
 ENV PGRST_DB_URI= \
     PGRST_DB_SCHEMA=public \
     PGRST_DB_ANON_ROLE= \