diff --git a/lib/threefold/grid3/deployer/deployer.v b/lib/threefold/grid3/deployer/deployer.v
new file mode 100644
index 00000000..83188435
--- /dev/null
+++ b/lib/threefold/grid3/deployer/deployer.v
@@ -0,0 +1,319 @@
+module deployer
+
+import os
+import json
+import time
+import log
+import freeflowuniverse.herolib.threefold.grid3.models
+import freeflowuniverse.herolib.threefold.grid3.griddriver
+import freeflowuniverse.herolib.ui.console
+
+@[heap]
+pub struct Deployer {
+pub:
+	mnemonics     string
+	substrate_url string
+	twin_id       u32
+	relay_url     string
+	chain_network ChainNetwork
+	env           string
+pub mut:
+	client griddriver.Client
+	logger log.Log
+}
+
+pub enum ChainNetwork {
+	dev
+	qa
+	test
+	main
+}
+
+const substrate_url = {
+	ChainNetwork.dev:  'wss://tfchain.dev.grid.tf/ws'
+	ChainNetwork.qa:   'wss://tfchain.qa.grid.tf/ws'
+	ChainNetwork.test: 'wss://tfchain.test.grid.tf/ws'
+	ChainNetwork.main: 'wss://tfchain.grid.tf/ws'
+}
+
+const envs = {
+	ChainNetwork.dev:  'dev'
+	ChainNetwork.qa:   'qa'
+	ChainNetwork.test: 'test'
+	ChainNetwork.main: 'main'
+}
+
+const relay_url = {
+	ChainNetwork.dev:  'wss://relay.dev.grid.tf'
+	ChainNetwork.qa:   'wss://relay.qa.grid.tf'
+	ChainNetwork.test: 'wss://relay.test.grid.tf'
+	ChainNetwork.main: 'wss://relay.grid.tf'
+}
+
+pub fn get_mnemonics() !string {
+	mnemonics := os.getenv('TFGRID_MNEMONIC')
+	if mnemonics == '' {
+		return error('failed to get mnemonics, run `export TFGRID_MNEMONIC=....`')
+	}
+	return mnemonics
+}
+
+pub fn new_deployer(mnemonics string, chain_network ChainNetwork) !Deployer {
+	mut logger := &log.Log{}
+	logger.set_level(.debug)
+
+	mut client := griddriver.Client{
+		mnemonic:  mnemonics
+		substrate: substrate_url[chain_network]
+		relay:     relay_url[chain_network]
+	}
+	twin_id := client.get_user_twin() or { return error('failed to get twin ${err}') }
+
+	return Deployer{
+		mnemonics:     mnemonics
+		substrate_url: substrate_url[chain_network]
+		twin_id:       twin_id
+		chain_network: chain_network
+		relay_url:     relay_url[chain_network]
+		env:           envs[chain_network]
+		logger:        logger
+		client:        client
+	}
+}
+
+fn (mut d Deployer) handle_deploy(node_id u32, mut dl models.Deployment, hash_hex string) ! {
+	signature := d.client.sign_deployment(hash_hex)!
+	dl.add_signature(d.twin_id, signature)
+	payload := dl.json_encode()
+
+	node_twin_id := d.client.get_node_twin(node_id)!
+	d.rmb_deployment_deploy(node_twin_id, payload)!
+
+	mut versions := map[string]u32{}
+	for wl in dl.workloads {
+		versions[wl.name] = 0
+	}
+	d.wait_deployment(node_id, mut dl, versions)!
+}
+
+pub fn (mut d Deployer) update_deployment(node_id u32, mut dl models.Deployment, body string) ! {
+	// get deployment
+	// assign new workload versions
+	// update contract
+	// update deployment
+	old_dl := d.get_deployment(dl.contract_id, node_id)!
+	if !is_deployment_up_to_date(old_dl, dl) {
+		console.print_header('deployment with contract id ${dl.contract_id} is already up-to-date')
+		return
+	}
+
+	new_versions := d.update_versions(old_dl, mut dl)
+
+	hash_hex := dl.challenge_hash().hex()
+	signature := d.client.sign_deployment(hash_hex)!
+	dl.add_signature(d.twin_id, signature)
+	payload := dl.json_encode()
+
+	d.client.update_node_contract(dl.contract_id, body, hash_hex)!
+
+	node_twin_id := d.client.get_node_twin(node_id)!
+	d.rmb_deployment_update(node_twin_id, payload)!
+	d.wait_deployment(node_id, mut dl, new_versions)!
+}
+
+// update_versions increments the deployment version
+// and updates the updated workloads versions
+fn (mut d Deployer) update_versions(old_dl models.Deployment, mut new_dl models.Deployment) map[string]u32 {
+	mut old_hashes := map[string]string{}
+	mut old_versions := map[string]u32{}
+	mut new_versions := map[string]u32{}
+
+	for wl in old_dl.workloads {
+		hash := wl.challenge_hash().hex()
+		old_hashes[wl.name] = hash
+		old_versions[wl.name] = wl.version
+	}
+
+	new_dl.version = old_dl.version + 1
+
+	for mut wl in new_dl.workloads {
+		hash := wl.challenge_hash().hex()
+
+		if old_hashes[wl.name] != hash {
+			wl.version = new_dl.version
+		} else {
+			wl.version = old_versions[wl.name]
+		}
+
+		new_versions[wl.name] = wl.version
+	}
+
+	return new_versions
+}
+
+// same_workloads checks if both deployments have the same workloads, even if updated
+// this has to be done since a workload name is not included in a deployment's hash
+// so a user could just replace a workloads's name, and still get the same deployment's hash
+// but with a totally different workload, since a workload is identified by it's name
+fn same_workloads(dl1 models.Deployment, dl2 models.Deployment) bool {
+	if dl1.workloads.len != dl2.workloads.len {
+		return false
+	}
+
+	mut names := map[string]bool{}
+	for wl in dl1.workloads {
+		names[wl.name] = true
+	}
+
+	for wl in dl2.workloads {
+		if !names[wl.name] {
+			return false
+		}
+	}
+
+	return true
+}
+
+// is_deployment_up_to_date checks if new_dl is different from old_dl
+fn is_deployment_up_to_date(old_dl models.Deployment, new_dl models.Deployment) bool {
+	old_hash := old_dl.challenge_hash().hex()
+	new_hash := new_dl.challenge_hash().hex()
+	if old_hash != new_hash {
+		return true
+	}
+
+	return !same_workloads(old_dl, new_dl)
+}
+
+pub fn (mut d Deployer) deploy(node_id u32, mut dl models.Deployment, body string, solution_provider u64) !u64 {
+	public_ips := dl.count_public_ips()
+	hash_hex := dl.challenge_hash().hex()
+	contract_id := d.client.create_node_contract(node_id, body, hash_hex, public_ips,
+		solution_provider)!
+	d.logger.info('ContractID: ${contract_id}')
+	dl.contract_id = contract_id
+
+	d.handle_deploy(node_id, mut dl, hash_hex) or {
+		d.logger.info('Rolling back...')
+		d.logger.info('deleting contract id: ${contract_id}')
+		d.client.cancel_contract(contract_id)!
+		return err
+	}
+	return dl.contract_id
+}
+
+pub fn (mut d Deployer) wait_deployment(node_id u32, mut dl models.Deployment, workload_versions map[string]u32) ! {
+	mut start := time.now()
+	num_workloads := dl.workloads.len
+	contract_id := dl.contract_id
+	mut last_state_ok := 0
+	for {
+		mut cur_state_ok := 0
+		mut new_workloads := []models.Workload{}
+		changes := d.deployment_changes(node_id, contract_id)!
+		for wl in changes {
+			if version := workload_versions[wl.name] {
+				if wl.version == version && wl.result.state == models.result_states.ok {
+					cur_state_ok += 1
+					new_workloads << wl
+				} else if wl.version == version && wl.result.state == models.result_states.error {
+					return error('failed to deploy deployment due error: ${wl.result.message}')
+				}
+			}
+		}
+
+		if cur_state_ok > last_state_ok {
+			last_state_ok = cur_state_ok
+			start = time.now()
+		}
+
+		if cur_state_ok == num_workloads {
+			dl.workloads = new_workloads
+			return
+		}
+
+		if (time.now() - start).minutes() > 5 {
+			return error('failed to deploy deployment: contractID: ${contract_id}, some workloads are not ready after wating 5 minutes')
+		} else {
+			d.logger.info('Waiting for deployment with contract ${contract_id} to become ready')
+			time.sleep(500 * time.millisecond)
+		}
+	}
+}
+
+pub fn (mut d Deployer) get_deployment(contract_id u64, node_id u32) !models.Deployment {
+	twin_id := d.client.get_node_twin(node_id)!
+	payload := {
+		'contract_id': contract_id
+	}
+	res := d.rmb_deployment_get(twin_id, json.encode(payload)) or {
+		return error('failed to get deployment with contract id ${contract_id} due to: ${err}')
+	}
+	return json.decode(models.Deployment, res)
+}
+
+pub fn (mut d Deployer) delete_deployment(contract_id u64, node_id u32) !models.Deployment {
+	twin_id := d.client.get_node_twin(node_id)!
+	payload := {
+		'contract_id': contract_id
+	}
+	res := d.rmb_deployment_delete(twin_id, json.encode(payload))!
+	return json.decode(models.Deployment, res)
+}
+
+pub fn (mut d Deployer) deployment_changes(node_id u32, contract_id u64) ![]models.Workload {
+	twin_id := d.client.get_node_twin(node_id)!
+
+	res := d.rmb_deployment_changes(twin_id, contract_id)!
+	return json.decode([]models.Workload, res)
+}
+
+pub fn (mut d Deployer) batch_deploy(name_contracts []string, mut dls map[u32]&models.Deployment, solution_provider ?u64) !(map[string]u64, map[u32]&models.Deployment) {
+	mut batch_create_contract_data := []griddriver.BatchCreateContractData{}
+	for name_contract in name_contracts {
+		batch_create_contract_data << griddriver.BatchCreateContractData{
+			name: name_contract
+		}
+	}
+
+	mut hash_map := map[u32]string{}
+	for node, dl in dls {
+		public_ips := dl.count_public_ips()
+		hash_hex := dl.challenge_hash().hex()
+		hash_map[node] = hash_hex
+		batch_create_contract_data << griddriver.BatchCreateContractData{
+			node:                 node
+			body:                 dl.metadata
+			hash:                 hash_hex
+			public_ips:           public_ips
+			solution_provider_id: solution_provider
+		}
+	}
+
+	contract_ids := d.client.batch_create_contracts(batch_create_contract_data)!
+	mut name_contracts_map := map[string]u64{}
+	mut threads := []thread !{}
+	for idx, data in batch_create_contract_data {
+		contract_id := contract_ids[idx]
+		if data.name != '' {
+			name_contracts_map[data.name] = contract_id
+			continue
+		}
+
+		mut dl := dls[data.node] or { return error('Node ${data.node} not found in dls map') }
+		dl.contract_id = contract_id
+		threads << spawn d.handle_deploy(data.node, mut dl, hash_map[data.node])
+	}
+
+	for th in threads {
+		th.wait() or {
+			console.print_stderr('Rolling back: cancling the depolyed contracts: ${contract_ids} due to ${err}')
+			d.client.batch_cancel_contracts(contract_ids) or {
+				return error('Faild to cancel contracts dut to: ${err}')
+			}
+			return error('Deployment failed: ${err}')
+		}
+	}
+
+	return name_contracts_map, dls
+}
diff --git a/lib/threefold/grid3/deployer/deployment.v b/lib/threefold/grid3/deployer/deployment.v
index a4353450..5140c37a 100644
--- a/lib/threefold/grid3/deployer/deployment.v
+++ b/lib/threefold/grid3/deployer/deployment.v
@@ -1,7 +1,6 @@
 module deployer
 
 import freeflowuniverse.herolib.threefold.grid3.models as grid_models
-import freeflowuniverse.herolib.threefold.grid
 import freeflowuniverse.herolib.ui.console
 import compress.zlib
 import encoding.hex
@@ -28,11 +27,11 @@ pub mut:
 mut:
 	// Set the deployed contracts on the deployment and save the full deployment to be able to delete the whole deployment when need.
 	contracts GridContracts
-	deployer  &grid.Deployer @[skip; str: skip]
+	deployer  &Deployer @[skip; str: skip]
 	kvstore   KVStoreFS      @[skip; str: skip]
 }
 
-fn get_deployer() !grid.Deployer {
+fn get_deployer() !Deployer {
 	mut grid_client := get()!
 
 	network := match grid_client.network {
diff --git a/lib/threefold/grid3/deployer/deployment_setup.v b/lib/threefold/grid3/deployer/deployment_setup.v
index f22e5155..4e7d386a 100644
--- a/lib/threefold/grid3/deployer/deployment_setup.v
+++ b/lib/threefold/grid3/deployer/deployment_setup.v
@@ -2,7 +2,6 @@
 module deployer
 
 import freeflowuniverse.herolib.threefold.grid3.models as grid_models
-import freeflowuniverse.herolib.threefold.grid
 import freeflowuniverse.herolib.ui.console
 import rand
 
@@ -12,7 +11,7 @@ mut:
 	workloads       map[u32][]grid_models.Workload
 	network_handler NetworkHandler
 
-	deployer          &grid.Deployer @[skip; str: skip]
+	deployer          &Deployer @[skip; str: skip]
 	contracts_map     map[u32]u64
 	name_contract_map map[string]u64
 }
@@ -23,12 +22,12 @@ mut:
 // - vms: Array of VMachine instances representing the virtual machines to set up workloads for
 // - zdbs: Array of ZDB objects containing ZDB requirements
 // - webnames: Array of WebName instances representing web names
-// - deployer: Reference to the grid.Deployer for deployment operations
+// - deployer: Reference to the Deployer for deployment operations
 // Modifies:
 // - dls: Modified DeploymentSetup struct with network, VM, and ZDB workloads set up
 // Returns:
 // - None
-fn new_deployment_setup(network_specs NetworkSpecs, vms []VMachine, zdbs []ZDB, webnames []WebName, old_deployments map[u32]grid_models.Deployment, mut deployer grid.Deployer) !DeploymentSetup {
+fn new_deployment_setup(network_specs NetworkSpecs, vms []VMachine, zdbs []ZDB, webnames []WebName, old_deployments map[u32]grid_models.Deployment, mut deployer Deployer) !DeploymentSetup {
 	mut dls := DeploymentSetup{
 		deployer:        deployer
 		network_handler: NetworkHandler{
diff --git a/lib/threefold/grid3/deployer/network.v b/lib/threefold/grid3/deployer/network.v
index 9bca92e9..8f6f66be 100644
--- a/lib/threefold/grid3/deployer/network.v
+++ b/lib/threefold/grid3/deployer/network.v
@@ -1,7 +1,6 @@
 module deployer
 
 import freeflowuniverse.herolib.threefold.grid3.models as grid_models
-import freeflowuniverse.herolib.threefold.grid
 import freeflowuniverse.herolib.ui.console
 import json
 import rand
@@ -63,7 +62,7 @@ mut:
 	// user_access_endopoints int
 	user_access_configs []UserAccessConfig
 
-	deployer &grid.Deployer @[skip; str: skip]
+	deployer &Deployer @[skip; str: skip]
 }
 
 // TODO: maybe rename to fill_network or something similar
diff --git a/lib/threefold/grid3/deployer/utils.v b/lib/threefold/grid3/deployer/utils.v
index 584e1aae..2261cb84 100644
--- a/lib/threefold/grid3/deployer/utils.v
+++ b/lib/threefold/grid3/deployer/utils.v
@@ -1,7 +1,6 @@
 module deployer
 
 import freeflowuniverse.herolib.threefold.grid3.gridproxy
-import freeflowuniverse.herolib.threefold.grid
 import freeflowuniverse.herolib.threefold.grid3.models as grid_models
 import freeflowuniverse.herolib.threefold.grid3.gridproxy.model as gridproxy_models
 import rand
@@ -44,7 +43,7 @@ fn convert_to_gigabytes(bytes u64) u64 {
 	return bytes * 1024 * 1024 * 1024
 }
 
-fn pick_node(mut deployer grid.Deployer, nodes []gridproxy_models.Node) !gridproxy_models.Node {
+fn pick_node(mut deployer Deployer, nodes []gridproxy_models.Node) !gridproxy_models.Node {
 	mut node := ?gridproxy_models.Node(none)
 	mut checked := []bool{len: nodes.len}
 	mut checked_cnt := 0
@@ -69,7 +68,7 @@ fn pick_node(mut deployer grid.Deployer, nodes []gridproxy_models.Node) !gridpro
 	}
 }
 
-fn ping_node(mut deployer grid.Deployer, twin_id u32) bool {
+fn ping_node(mut deployer Deployer, twin_id u32) bool {
 	if _ := deployer.client.get_zos_version(twin_id) {
 		return true
 	} else {