diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f401f6fd..a1ff200a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -151,7 +151,7 @@ jobs:
           sed -i -e 's/#ckan.plugins/ckan.plugins/' ckanext/ckanext-xroad_integration/test.ini
           
           ckan -c ckanext/ckanext-xroad_integration/test.ini db init
-          ckan -c ckanext/ckanext-xroad_integration/test.ini harvester initdb
+          ckan -c ckanext/ckanext-xroad_integration/test.ini db upgrade -p harvest
           ckan -c ckanext/ckanext-xroad_integration/test.ini xroad init-db
 
           # Disable plugins in test.ini
diff --git a/ansible/roles/ckan/tasks/database.yml b/ansible/roles/ckan/tasks/database.yml
index be8e1236..de296331 100755
--- a/ansible/roles/ckan/tasks/database.yml
+++ b/ansible/roles/ckan/tasks/database.yml
@@ -30,7 +30,7 @@
   with_items: "{{ ckan_admins }}"
 
 - name: Initialize Harvest database
-  shell: ./bin/ckan --config {{ ckan_ini }} harvester initdb chdir={{ virtualenv }}
+  shell: ./bin/ckan --config {{ ckan_ini }} db upgrade -p harvest chdir={{ virtualenv }}
 
 - name: Initialize Link Validation database
   shell: ./bin/ckan --config {{ ckan_ini }} links initdb chdir={{ virtualenv }}
diff --git a/ckanext/ckanext-harvest b/ckanext/ckanext-harvest
index fe56dc93..6b84de46 160000
--- a/ckanext/ckanext-harvest
+++ b/ckanext/ckanext-harvest
@@ -1 +1 @@
-Subproject commit fe56dc93828bee366c9a77646e0cee4606cbd2da
+Subproject commit 6b84de46f45cdcccdb8a620d7bb6ea9302b1e466
diff --git a/ckanext/ckanext-xroad_integration b/ckanext/ckanext-xroad_integration
index 54329b23..0f03013a 160000
--- a/ckanext/ckanext-xroad_integration
+++ b/ckanext/ckanext-xroad_integration
@@ -1 +1 @@
-Subproject commit 54329b23f0f11caad1b160708301a69430fdc1a2
+Subproject commit 0f03013a9fb787af5e0e2080987cf607d00c7e1d