diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 4cce243a..afc17f03 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -60,10 +60,8 @@ jobs:
           python manage.py makemigrations
           python manage.py migrate
           coverage run manage.py test
-          exit_code=$?
           coverage xml
           EOF
-          exit $exit_cod
 
       - name: Upload coverage to codecov
         uses: codecov/codecov-action@v2
diff --git a/REQUIREMENTS.txt b/REQUIREMENTS.txt
index 22a94caa..9ebc7387 100644
--- a/REQUIREMENTS.txt
+++ b/REQUIREMENTS.txt
@@ -9,7 +9,12 @@ Markdown==2.3.1
 #PIL==1.1.7
 Pillow
 Pygments==2.7.4
-Whoosh==2.5.6
+
+# Updates for Django 2 & Python 3.7
+git+https://github.com/Xpirix/whoosh.git
+pickle5==0.0.12
+django-haystack==3.2.1
+
 argparse==1.2.1
 #cab==0.2.0 # Not used anymore..-
 #distribute==0.7.3
@@ -20,7 +25,6 @@ django-debug-toolbar==1.11.1
 django-endless-pagination==2.0
 django-extensions==1.2.0
 django-generic-aggregation==0.3.2
-django-haystack==2.4.0
 #django-olwidget==0.61.0 unmaintained, use this fork
 git+https://github.com/Christophe31/olwidget.git
 django-pagination==1.0.7
@@ -30,7 +34,7 @@ git+https://github.com/enikesha/django-ratings.git
 django-simple-ratings==0.3.2
 # SIMPLEMENU
 git+https://github.com/elpaso/django-simplemenu.git
-django-taggit==0.14.0
+django-taggit==2.0.0
 django-taggit-autosuggest==0.2.7
 django-taggit-templatetags==0.4.6dev0
 django-templatetag-sugar==0.1
diff --git a/dockerize/docker/Dockerfile b/dockerize/docker/Dockerfile
index 9ce83a88..3b953577 100644
--- a/dockerize/docker/Dockerfile
+++ b/dockerize/docker/Dockerfile
@@ -12,7 +12,7 @@ RUN echo "deb http://archive.debian.org/debian stretch main contrib non-free" >
 RUN apt-get update && apt-get install -y libsasl2-dev python-dev libldap2-dev libssl-dev
 ADD REQUIREMENTS.txt /REQUIREMENTS.txt
 RUN pip install -r /REQUIREMENTS.txt
-RUN pip install uwsgi
+RUN pip install uwsgi freezegun
 
 # https://docs.docker.com/examples/running_ssh_service/
 # Sudo is needed by pycharm when it tries to pip install packages
diff --git a/dockerize/docker/REQUIREMENTS.txt b/dockerize/docker/REQUIREMENTS.txt
index c4ef0466..9ef6d0e5 100644
--- a/dockerize/docker/REQUIREMENTS.txt
+++ b/dockerize/docker/REQUIREMENTS.txt
@@ -21,7 +21,8 @@ django-sortable-listview
 sorl-thumbnail
 django-extensions
 django-debug-toolbar==1.11.1
-# Updates for Django 2
+
+# Updates for Django 2  & Python 3.7
 git+https://github.com/Xpirix/whoosh.git
 pickle5==0.0.12
 django-haystack==3.2.1
diff --git a/qgis-app/REQUIREMENTS_plugins.txt b/qgis-app/REQUIREMENTS_plugins.txt
index f7dca41a..1e382950 100644
--- a/qgis-app/REQUIREMENTS_plugins.txt
+++ b/qgis-app/REQUIREMENTS_plugins.txt
@@ -1,7 +1,7 @@
 django==2.2.25
 django-auth-ldap
 python-ldap
-django-taggit
+django-taggit==2.0.0
 django-tinymce==3.4.0
 psycopg2
 # Updates for Django 2
@@ -21,5 +21,8 @@ django-sortable-listview
 sorl-thumbnail
 django-extensions
 django-debug-toolbar==1.11.1
-whoosh
-django-haystack
+
+# Updates for Django 2 & Python 3.7
+git+https://github.com/Xpirix/whoosh.git
+pickle5==0.0.12
+django-haystack==3.2.1
diff --git a/qgis-app/plugins/tests/test_plugin_list.py b/qgis-app/plugins/tests/test_plugin_list.py
index b17c0e17..48972e11 100644
--- a/qgis-app/plugins/tests/test_plugin_list.py
+++ b/qgis-app/plugins/tests/test_plugin_list.py
@@ -1,6 +1,6 @@
 from django.test import TestCase
 from django.urls import reverse
-from ..models import Plugin
+from plugins.models import Plugin
 
 class PluginsListViewTestCase(TestCase):
     fixtures = [
diff --git a/qgis-app/plugins/tests/test_plugin_version_feedback.py b/qgis-app/plugins/tests/test_plugin_version_feedback.py
index c2034c98..36f6fc0f 100644
--- a/qgis-app/plugins/tests/test_plugin_version_feedback.py
+++ b/qgis-app/plugins/tests/test_plugin_version_feedback.py
@@ -244,11 +244,11 @@ def test_only_staff_can_see_new_feedback_form(self):
         self.client.force_login(user=self.creator)
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
-        self.assertNotContains(response, '<div class="span8 new-feedback">')
+        self.assertNotContains(response, '<div class="new-feedback">')
         self.client.force_login(user=self.staff)
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
-        self.assertContains(response, '<div class="span8 new-feedback">')
+        self.assertContains(response, '<div class="new-feedback">')
 
     def test_post_create_single_task_feedback(self):
         self.client.force_login(self.staff)