diff --git a/roles/lokole/tasks/install.yml b/roles/lokole/tasks/install.yml
index 776014396..849d899bb 100644
--- a/roles/lokole/tasks/install.yml
+++ b/roles/lokole/tasks/install.yml
@@ -23,24 +23,13 @@
       - wvdial
     state: present
 
-- name: "workarounds for older flask version used"
-  pip:
-    name: "{{ item.name }}"
-    version: "{{ item.version }}"
-    virtualenv: "{{ lokole_venv }}"
-    virtualenv_command: python3 -m venv "{{ lokole_venv }}"
-    extra_args: --no-cache-dir    # To avoid caching issues e.g. soon after new releases hit https://pypi.org/project/opwen-email-client/
-  with_items:
-    - { name: 'itsdangerous', version: '2.0.1' }
-    - { name: 'Jinja2', version: '3.0.3' }
-
 
 # For development purposes -- To install Lokole from a given commit, add the
 # following line to roles/lokole/defaults/main.yml:
 # lokole_commit: <git_commit_id>
 - name: "OPTIONAL: pip install opwen_email_client (Lokole, git commit {{ lokole_commit }}) from GitHub to {{ lokole_venv }}, if lokole_commit is defined"
   pip:
-    name: "git+https://github.com/ascoderu/lokole.git@{{ lokole_commit }}#egg=opwen_email_client"
+    name: "git+https://github.com/mabuelhagag/lokole.git@{{ lokole_commit }}#egg=opwen_email_client"
     virtualenv: "{{ lokole_venv }}"
     virtualenv_command: python3 -m venv "{{ lokole_venv }}"
     extra_args: --no-cache-dir    # To avoid caching issues e.g. soon after new releases hit https://pypi.org/project/opwen-email-client/
diff --git a/roles/lokole/tasks/setup.yml b/roles/lokole/tasks/setup.yml
index 1f49661c6..3c5b71b7c 100644
--- a/roles/lokole/tasks/setup.yml
+++ b/roles/lokole/tasks/setup.yml
@@ -6,7 +6,9 @@
 - name: Create Lokole admin user with password, for http://box{{ lokole_url }}    # http://box/lokole
   shell: |
     while read envvar; do export "$envvar"; done < {{ lokole_run_dir }}/settings.env
-    {{ lokole_venv }}/bin/manage.py createadmin --name='{{ lokole_admin_user }}' --password='{{ lokole_admin_password }}'
+    cd {{ lokole_venv }}/lib/python${python_version}/site-packages/
+    export FLASK_APP="opwen_email_client.webapp:app"
+    {{ lokole_venv }}/bin/flask manage createadmin --name='{{ lokole_admin_user }}' --password='{{ lokole_admin_password }}'
 
 - name: Change owner of dbfiles
   file:
diff --git a/roles/lokole/templates/lokole_restarter.conf b/roles/lokole/templates/lokole_restarter.conf
index 94f580e9c..ab0118625 100644
--- a/roles/lokole/templates/lokole_restarter.conf
+++ b/roles/lokole/templates/lokole_restarter.conf
@@ -1,5 +1,5 @@
 [program:lokole_restarter]
-command={{ lokole_venv }}/bin/manage.py restarter --directory={{ lokole_run_dir }}/lokole_restarter
+command={{ lokole_venv }}/bin/flask manage restarter --directory={{ lokole_run_dir }}/lokole_restarter
 autostart=true
 autorestart=true
 startretries=3
@@ -7,4 +7,4 @@ stopasgroup=true
 stderr_logfile={{ lokole_log_dir }}/lokole_restarter.stderr.log
 stdout_logfile={{ lokole_log_dir }}/lokole_restarter.stdout.log
 user=root
-environment=OPWEN_SETTINGS={{ lokole_settings }}
+environment=FLASK_APP="opwen_email_client.webapp",OPWEN_SETTINGS={{ lokole_settings }}