diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d510c943b5334a695c00766730687d2469f5e682..aab1140bc020ee5615dd1c07a2c631244b32b657 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.com/arkindex/backend:base-0.9.4
+image: registry.gitlab.com/arkindex/backend:base-0.9.6
 stages:
   - test
   - build
@@ -8,7 +8,7 @@ cache:
     - .cache/pip
 
 before_script:
-  - apk --update add build-base libffi-dev openssl-dev
+  - apk --update add build-base
   # Custom line to install our own deps from Git using GitLab CI credentials
   - "pip install -e git+https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/arkindex/common#egg=arkindex-common"
   - "pip install -e git+https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/arkindex/ponos#egg=ponos-server"
diff --git a/Dockerfile b/Dockerfile
index f3bdcc71278cb7186093854af2e6159d1e5ccee1..f9b6c9936ac2a710d98b548a20f17e25fbce46a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/arkindex/backend:base-0.9.4
+FROM registry.gitlab.com/arkindex/backend:base-0.9.6
 
 ARG COMMON_BRANCH=master
 ARG COMMON_ID=9855787
diff --git a/base/Dockerfile b/base/Dockerfile
index ef1d48c8f3808f1d5d2c413c2f6589899fdf34ef..2469ff365aac45e27333f4dee1cfadb6a21d7a70 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -3,7 +3,7 @@ FROM python:3.6-alpine as base
 FROM base as staging
 
 # Add system dependencies, use cache by copying requirements
-RUN apk add --update --no-cache postgresql-dev jpeg-dev build-base gzip zlib-dev libmagic libxml2-dev libxslt-dev
+RUN apk add --update --no-cache postgresql-dev jpeg-dev build-base gzip zlib-dev libmagic libxml2-dev libxslt-dev libffi-dev
 
 # Install long buildtime deps
 # Uses a source archive instead of full local copy to speedup docker build
diff --git a/base/requirements.txt b/base/requirements.txt
index 25992b65e9caf29c2e4e30bdc3b1e667a4e67f23..10f309948ab32d52e33cda4967f1534e470fd378 100644
--- a/base/requirements.txt
+++ b/base/requirements.txt
@@ -1,3 +1,4 @@
+cryptography>=2.7
 Django==2.2
 elasticsearch==6.2.0
 ijson==2.3