diff --git a/consent_provider/Dockerfile b/consent_provider/Dockerfile
index 9fee35cb19a053717ab48e13e47eaf2294a25349..bac68e14905877c63e5bec0122355d03ba6df0be 100644
--- a/consent_provider/Dockerfile
+++ b/consent_provider/Dockerfile
@@ -1,4 +1,6 @@
-FROM python:3.7
+FROM python:3.7-alpine
+
+RUN apk add gcc libc-dev libffi-dev
 
 WORKDIR /usr/src/app
 
diff --git a/login_provider/Dockerfile b/login_provider/Dockerfile
index cf821f60f279d4a14c866c3aff193b2b2cbeb8ea..b8d61ef1b88fb936e98761e97b66f84194577e65 100644
--- a/login_provider/Dockerfile
+++ b/login_provider/Dockerfile
@@ -1,4 +1,6 @@
-FROM python:3.7
+FROM python:3.7-alpine
+
+RUN apk add gcc libc-dev libffi-dev
 
 WORKDIR /usr/src/app
 
diff --git a/test/login_logout/Dockerfile b/test/login_logout/Dockerfile
index 817fb34319687d7b26cd809e2e77d724b9ebd4ad..9dbbf62141109039333c9c3b80a3cb201477cc09 100644
--- a/test/login_logout/Dockerfile
+++ b/test/login_logout/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.7-alpine
 
 WORKDIR /usr/src/app
 
diff --git a/test/login_logout/requirements.txt b/test/login_logout/requirements.txt
index 763ef07295ca07b48e6d6ec65a5f64102a81a3e2..065d7e389ee6f83b5684639db175728a511c694d 100644
--- a/test/login_logout/requirements.txt
+++ b/test/login_logout/requirements.txt
@@ -1,2 +1,3 @@
 Flask
 Flask-OAuthlib
+Werkzeug==0.16.1 # Due to bug: cannot find url_quote https://stackoverflow.com/questions/60192172/importerror-cannot-import-name-filestorage-from-werkzeug. Can be fixed by migrating from flask-oauthlib to oauthlib.
diff --git a/user-panel b/user-panel
index b65ce8ad3ee18c2606c8f862f0f87fcb53b4d24b..1d37f6ec08d63dce87618213908f07d11f83a51d 160000
--- a/user-panel
+++ b/user-panel
@@ -1 +1 @@
-Subproject commit b65ce8ad3ee18c2606c8f862f0f87fcb53b4d24b
+Subproject commit 1d37f6ec08d63dce87618213908f07d11f83a51d