diff --git a/Dockerfile b/Dockerfile
index f7c3464..cbc1743 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,6 @@ FROM golang:1.20-alpine as buildbase
 
 WORKDIR /go/src/github.com/rarimo/bdjuno
 RUN apk add build-base
-COPY vendor .
 COPY . .
 ENV GO111MODULE="on"
 ENV CGO_ENABLED=1
diff --git a/database/rarimocore.go b/database/rarimocore.go
index 0623b84..64d113a 100644
--- a/database/rarimocore.go
+++ b/database/rarimocore.go
@@ -474,14 +474,16 @@ func (db *Db) SaveConfirmations(confirmations []types.Confirmation) (err error)
 	var confirmationsParams []interface{}
 
 	for i, confirmation := range confirmations {
-		vi := i * 4
-		confirmationsQuery += fmt.Sprintf("($%d, $%d, $%d, $%d),", vi+1, vi+2, vi+3, vi+4)
+		vi := i * 6
+		confirmationsQuery += fmt.Sprintf("($%d, $%d, $%d, $%d, $%d, $%d),", vi+1, vi+2, vi+3, vi+4, vi+5, vi+6)
 
 		confirmationsParams = append(confirmationsParams,
 			confirmation.Root,
 			pq.StringArray(confirmation.Indexes),
 			confirmation.SignatureECDSA,
 			confirmation.Creator,
+			confirmation.Tx,
+			confirmation.Height,
 		)
 	}
 
@@ -500,13 +502,13 @@ func (db *Db) SaveRarimoCoreVotes(votes []types.RarimoCoreVote) (err error) {
 		return nil
 	}
 
-	query := `INSERT INTO vote (operation, validator, vote) VALUES `
+	query := `INSERT INTO vote (operation, validator, vote, tx, height) VALUES `
 	var queryParams []interface{}
 
 	for i, vote := range votes {
-		vi := i * 3
-		query += fmt.Sprintf("($%d, $%d, $%d),", vi+1, vi+2, vi+3)
-		queryParams = append(queryParams, vote.Operation, vote.Validator, vote.Vote)
+		vi := i * 5
+		query += fmt.Sprintf("($%d, $%d, $%d, $%d, $%d),", vi+1, vi+2, vi+3, vi+4, vi+5)
+		queryParams = append(queryParams, vote.Operation, vote.Validator, vote.Vote, vote.Tx, vote.Height)
 	}
 
 	query = strings.TrimSuffix(query, ",") // Remove trailing ","
diff --git a/database/schema/12-tokenmanager.sql b/database/schema/12-tokenmanager.sql
index f925f42..8975747 100644
--- a/database/schema/12-tokenmanager.sql
+++ b/database/schema/12-tokenmanager.sql
@@ -1,5 +1,5 @@
 -- +migrate Up
-CREATE TABLE networks
+CREATE TABLE network
 (
     name   TEXT  NOT NULL PRIMARY KEY,
     type   INT   NOT NULL,
@@ -49,4 +49,4 @@ DROP TABLE on_chain_item;
 DROP TABLE item;
 DROP TABLE collection_data;
 DROP TABLE collection;
-DROP TABLE networks;
+DROP TABLE network;
diff --git a/database/tokenmanager.go b/database/tokenmanager.go
index 01bcb41..9a3e2f5 100644
--- a/database/tokenmanager.go
+++ b/database/tokenmanager.go
@@ -14,7 +14,7 @@ func (db *Db) SaveNetworks(networks []types.Network) (err error) {
 		return nil
 	}
 
-	stmt := `INSERT INTO networks (name, type, params) VALUES`
+	stmt := `INSERT INTO network (name, type, params) VALUES`
 	var params []interface{}
 
 	for i, network := range networks {
@@ -38,8 +38,14 @@ func (db *Db) SaveNetworks(networks []types.Network) (err error) {
 	stmt = strings.TrimSuffix(stmt, ",") // Remove trailing ","
 	stmt += ` ON CONFLICT (name) DO UPDATE
  	SET params = excluded.params
-WHERE networks.name = excluded.name
+WHERE network.name = excluded.name
 `
+
+	_, err = db.SQL.Exec(stmt, params...)
+	if err != nil {
+		return fmt.Errorf("error while storing networks: %s", err)
+	}
+
 	return nil
 }
 
diff --git a/hasura/metadata/databases/bdjuno/tables/public_networks.yaml b/hasura/metadata/databases/bdjuno/tables/public_network.yaml
similarity index 91%
rename from hasura/metadata/databases/bdjuno/tables/public_networks.yaml
rename to hasura/metadata/databases/bdjuno/tables/public_network.yaml
index 42d2b63..b274e50 100644
--- a/hasura/metadata/databases/bdjuno/tables/public_networks.yaml
+++ b/hasura/metadata/databases/bdjuno/tables/public_network.yaml
@@ -1,5 +1,5 @@
 table:
-  name: networks
+  name: network
   schema: public
 select_permissions:
   - permission:
diff --git a/hasura/metadata/databases/bdjuno/tables/tables.yaml b/hasura/metadata/databases/bdjuno/tables/tables.yaml
index 4e70934..d30ae2b 100644
--- a/hasura/metadata/databases/bdjuno/tables/tables.yaml
+++ b/hasura/metadata/databases/bdjuno/tables/tables.yaml
@@ -56,7 +56,7 @@
 - "!include public_collection_data.yaml"
 - "!include public_on_chain_item.yaml"
 - "!include public_seed.yaml"
-- "!include public_networks.yaml"
+- "!include public_network.yaml"
 - "!include public_vote.yaml"
 - "!include public_violation_report.yaml"
 - "!include public_oraclemanager_params.yaml"