diff --git a/.gitmodules b/.gitmodules
index 4d3518d1..e535465c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "docs"]
-    path = docs
-    url = https://github.com/bitshares/bitshares-core.wiki.git
-    ignore = dirty
+	path = docs
+	url = https://github.com/bitshares/bitshares-core.wiki.git
+	ignore = dirty
 [submodule "libraries/fc"]
-    path = libraries/fc
-    url = https://github.com/peerplays-network/peerplays-fc.git
-    branch = latest-fc
-    ignore = dirty
+	path = libraries/fc
+	url = https://gitlab.com/PBSA/tools-libs/peerplays-fc.git
+	branch = latest-fc
+	ignore = dirty
diff --git a/docs b/docs
index 8df8f663..1e924950 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 8df8f66389853df73ab8f6dd73981be2a6957df8
+Subproject commit 1e924950c2f92b166c34ceb294e8b8c4997a6c4e
diff --git a/libraries/fc b/libraries/fc
index 48888392..86b77c6e 160000
--- a/libraries/fc
+++ b/libraries/fc
@@ -1 +1 @@
-Subproject commit 488883921936139e8734b99822d3a589afe80da1
+Subproject commit 86b77c6eb450f97a29c627d3fa9728e25bed933a
diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp
index 06a76502..86876782 100644
--- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp
+++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp
@@ -589,7 +589,7 @@ void sidechain_net_handler::settle_sidechain_transactions() {
       if (settle_amount.amount != 0) {
          if (sto.object_id.is<son_wallet_deposit_id_type>()) {
             asset_issue_operation ai_op;
-            ai_op.fee = asset(2001000);
+            ai_op.fee = database.current_fee_schedule().calculate_fee(ai_op);
             ai_op.issuer = gpo.parameters.son_account();
             ai_op.asset_to_issue = settle_amount;
             ai_op.issue_to_account = database.get<son_wallet_deposit_object>(sto.object_id).peerplays_from;
@@ -598,7 +598,7 @@ void sidechain_net_handler::settle_sidechain_transactions() {
 
          if (sto.object_id.is<son_wallet_withdraw_id_type>()) {
             asset_reserve_operation ar_op;
-            ar_op.fee = asset(2001000);
+            ar_op.fee = database.current_fee_schedule().calculate_fee(ar_op);
             ar_op.payer = gpo.parameters.son_account();
             ar_op.amount_to_reserve = settle_amount;
             proposal_op.proposed_ops.emplace_back(ar_op);
diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp
index 499f1e65..0cbdef29 100644
--- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp
+++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp
@@ -627,7 +627,7 @@ bool sidechain_net_handler_hive::process_deposit(const son_wallet_deposit_object
    proposal_op.proposed_ops.emplace_back(swdp_op);
 
    asset_issue_operation ai_op;
-   ai_op.fee = asset(2001000);
+   ai_op.fee = database.current_fee_schedule().calculate_fee(ai_op);
    ai_op.issuer = gpo.parameters.son_account();
    ai_op.asset_to_issue = asset_to_issue;
    ai_op.issue_to_account = swdo.peerplays_from;