diff --git a/cli/compile_upload.vsh b/cli/compile_upload.vsh
index 7a9ed988..93f5a553 100755
--- a/cli/compile_upload.vsh
+++ b/cli/compile_upload.vsh
@@ -28,7 +28,7 @@ fn get_platform_id() string {
 }
 
 fn read_secrets() ! {
-	secret_file := os.join_path(os.home_dir(), 'code/git.ourworld.tf/despiegk/hero_secrets/mysecrets.sh')
+	secret_file := os.join_path(os.home_dir(), 'code/git.threefold.info/despiegk/hero_secrets/mysecrets.sh')
 	if os.exists(secret_file) {
 		println('Reading secrets from ${secret_file}')
 		content := os.read_file(secret_file)!
diff --git a/docker/herolib/scripts/install_v.sh b/docker/herolib/scripts/install_v.sh
index a10fb814..83815d83 100755
--- a/docker/herolib/scripts/install_v.sh
+++ b/docker/herolib/scripts/install_v.sh
@@ -73,9 +73,9 @@ function sshknownkeysadd {
     then
         ssh-keyscan github.com >> ~/.ssh/known_hosts
     fi
-    if ! grep git.ourworld.tf ~/.ssh/known_hosts > /dev/null
+    if ! grep git.threefold.info ~/.ssh/known_hosts > /dev/null
     then
-        ssh-keyscan git.ourworld.tf >> ~/.ssh/known_hosts
+        ssh-keyscan git.threefold.info >> ~/.ssh/known_hosts
     fi    
     git config --global pull.rebase false
 
diff --git a/examples/biztools/_archive/investor_tool.vsh b/examples/biztools/_archive/investor_tool.vsh
index 3beeb50e..126ed3cb 100755
--- a/examples/biztools/_archive/investor_tool.vsh
+++ b/examples/biztools/_archive/investor_tool.vsh
@@ -5,7 +5,7 @@ import freeflowuniverse.herolib.core.playbook
 import os
 
 mut plbook := playbook.new(
-	path: '${os.home_dir()}/code/git.ourworld.tf/ourworld_holding/investorstool/output'
+	path: '${os.home_dir()}/code/git.threefold.info/ourworld_holding/investorstool/output'
 )!
 mut it := investortool.play(mut plbook)!
 it.check()!
diff --git a/examples/biztools/_archive/tf9_biz.vsh b/examples/biztools/_archive/tf9_biz.vsh
index 0db9964a..fc58d98f 100755
--- a/examples/biztools/_archive/tf9_biz.vsh
+++ b/examples/biztools/_archive/tf9_biz.vsh
@@ -12,7 +12,7 @@ import os
 
 const name = 'tf9_budget'
 
-const wikipath = '${os.home_dir()}/code/git.ourworld.tf/ourworld_holding/info_ourworld/collections/${name}'
+const wikipath = '${os.home_dir()}/code/git.threefold.info/ourworld_holding/info_ourworld/collections/${name}'
 const summarypath = '${wikipath}/summary.md'
 
 // mut sh := spreadsheet.sheet_new(name: 'test2') or { panic(err) }
diff --git a/examples/develop/gittools/gittools_path_get.vsh b/examples/develop/gittools/gittools_path_get.vsh
index a23f4e34..21d59ad5 100755
--- a/examples/develop/gittools/gittools_path_get.vsh
+++ b/examples/develop/gittools/gittools_path_get.vsh
@@ -8,7 +8,7 @@ mut gs := gittools.new()!
 mydocs_path := gs.get_path(
 	pull:  true
 	reset: false
-	url:   'https://git.ourworld.tf/tfgrid/info_docs_depin/src/branch/main/docs'
+	url:   'https://git.threefold.info/tfgrid/info_docs_depin/src/branch/main/docs'
 )!
 
 println(mydocs_path)
diff --git a/examples/develop/juggler/hero/playbook/juggler.md b/examples/develop/juggler/hero/playbook/juggler.md
index 42cb741e..d5dee07d 100644
--- a/examples/develop/juggler/hero/playbook/juggler.md
+++ b/examples/develop/juggler/hero/playbook/juggler.md
@@ -1,5 +1,5 @@
 !!juggler.configure
-	url: 'https://git.ourworld.tf/projectmycelium/itenv'
+	url: 'https://git.threefold.info/projectmycelium/itenv'
     username: ''
     password: ''
     port: 8000
diff --git a/examples/develop/juggler/hero_example.sh b/examples/develop/juggler/hero_example.sh
index 669028ee..53d0321d 100644
--- a/examples/develop/juggler/hero_example.sh
+++ b/examples/develop/juggler/hero_example.sh
@@ -1 +1 @@
-hero juggler -u https://git.ourworld.tf/projectmycelium/itenv
\ No newline at end of file
+hero juggler -u https://git.threefold.info/projectmycelium/itenv
\ No newline at end of file
diff --git a/examples/develop/juggler/v_example.vsh b/examples/develop/juggler/v_example.vsh
index b81ffd52..cd3a64f8 100755
--- a/examples/develop/juggler/v_example.vsh
+++ b/examples/develop/juggler/v_example.vsh
@@ -8,7 +8,7 @@ import veb
 osal.load_env_file('${os.dir(@FILE)}/.env')!
 
 mut j := juggler.configure(
-	url:      'https://git.ourworld.tf/projectmycelium/itenv'
+	url:      'https://git.threefold.info/projectmycelium/itenv'
 	username: os.getenv('JUGGLER_USERNAME')
 	password: os.getenv('JUGGLER_PASSWORD')
 	reset:    true
diff --git a/examples/develop/juggler/v_example2.vsh b/examples/develop/juggler/v_example2.vsh
index 54fe1acc..99e77ba5 100755
--- a/examples/develop/juggler/v_example2.vsh
+++ b/examples/develop/juggler/v_example2.vsh
@@ -6,7 +6,7 @@ import os
 mut sm := startupmanager.get()!
 sm.start(
 	name:    'juggler'
-	cmd:     'hero juggler -secret planetfirst -u https://git.ourworld.tf/projectmycelium/itenv -reset true'
+	cmd:     'hero juggler -secret planetfirst -u https://git.threefold.info/projectmycelium/itenv -reset true'
 	env:     {
 		'HOME': os.home_dir()
 	}
diff --git a/examples/schemas/openrpc/zinit_rpc_example.vsh b/examples/schemas/openrpc/zinit_rpc_example.vsh
index 738242bc..4db7178f 100755
--- a/examples/schemas/openrpc/zinit_rpc_example.vsh
+++ b/examples/schemas/openrpc/zinit_rpc_example.vsh
@@ -1,7 +1,7 @@
 #!/usr/bin/env -S v -n -w -cg -gc none -cc tcc -d use_openssl -enable-globals run
 
 import freeflowuniverse.herolib.schemas.jsonrpc
-import freeflowuniverse.herolib.schemas.openrpc
+import freeflowuniverse.herolib.schemas.openrpc //for the model as used 
 import json
 import x.json2
 
diff --git a/examples/web/doctreeclient_example.vsh b/examples/web/doctreeclient_example.vsh
index ebdd1006..f2d171a8 100755
--- a/examples/web/doctreeclient_example.vsh
+++ b/examples/web/doctreeclient_example.vsh
@@ -11,7 +11,7 @@ println('=====================')
 println('\n1. Setting up doctree data in Redis...')
 
 tree.scan(
-	git_url:  'https://git.ourworld.tf/tfgrid/docs_tfgrid4/src/branch/main/collections'
+	git_url:  'https://git.threefold.info/tfgrid/docs_tfgrid4/src/branch/main/collections'
 	git_pull: false
 )!
 
diff --git a/examples/web/mdbook_markdown/doctree_export.vsh b/examples/web/mdbook_markdown/doctree_export.vsh
index f499a48f..b954134d 100755
--- a/examples/web/mdbook_markdown/doctree_export.vsh
+++ b/examples/web/mdbook_markdown/doctree_export.vsh
@@ -12,7 +12,7 @@ mut tree := doctree.new(name: 'test')!
 // git_pull  bool
 
 tree.scan(
-	git_url:  'https://git.ourworld.tf/tfgrid/docs_tfgrid4/src/branch/main/collections'
+	git_url:  'https://git.threefold.info/tfgrid/docs_tfgrid4/src/branch/main/collections'
 	git_pull: false
 )!
 
diff --git a/examples/web/starllight_example.vsh b/examples/web/starllight_example.vsh
index dc656e05..d5195dde 100755
--- a/examples/web/starllight_example.vsh
+++ b/examples/web/starllight_example.vsh
@@ -10,7 +10,7 @@ mut docs := starlight.new(
 
 // Create a new starlight site
 mut site := docs.get(
-	url:  'https://git.ourworld.tf/tfgrid/docs_aibox'
+	url:  'https://git.threefold.info/tfgrid/docs_aibox'
 	init: true // init means we put config files if not there
 )!
 
diff --git a/install_v.sh b/install_v.sh
index 90353eb8..16142727 100755
--- a/install_v.sh
+++ b/install_v.sh
@@ -88,9 +88,9 @@ function sshknownkeysadd {
     then
         ssh-keyscan github.com >> ~/.ssh/known_hosts
     fi
-    if ! grep git.ourworld.tf ~/.ssh/known_hosts > /dev/null
+    if ! grep git.threefold.info ~/.ssh/known_hosts > /dev/null
     then
-        ssh-keyscan git.ourworld.tf >> ~/.ssh/known_hosts
+        ssh-keyscan git.threefold.info >> ~/.ssh/known_hosts
     fi    
     git config --global pull.rebase false
 
diff --git a/lib/ai/mcp/rhai/example/example copy.vsh b/lib/ai/mcp/rhai/example/example copy.vsh
index 04b1fc36..6920dac5 100644
--- a/lib/ai/mcp/rhai/example/example copy.vsh	
+++ b/lib/ai/mcp/rhai/example/example copy.vsh	
@@ -60,7 +60,7 @@ fn main() {
 	}
 
 	// Read the rhaiwrapping.md file
-	rhai_wrapping_md := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhaiwrapping.md') or {
+	rhai_wrapping_md := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhaiwrapping.md') or {
 		println('Failed to read rhaiwrapping.md: ${err}')
 		return
 	}
@@ -140,7 +140,7 @@ fn main() {
 
 	println('Task completed successfully')
 	println('The wrapper files have been generated and compiled in the target directory.')
-	println('Check /Users/timurgordon/code/git.ourworld.tf/herocode/sal/src/rhai for the compiled output.')
+	println('Check /Users/timurgordon/code/git.threefold.info/herocode/sal/src/rhai for the compiled output.')
 }
 
 // Define the prompt functions
@@ -158,17 +158,17 @@ fn create_example(input string) string {
 
 // Define a Rhai wrapper generator function for Container functions
 fn create_rhai_wrappers(name string, source_code string, example_rhai string, wrapper_md string, errors_md string, crate_path string) string {
-	guides := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhaiwrapping_classicai.md') or {
+	guides := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhaiwrapping_classicai.md') or {
 		panic('Failed to read guides')
 	}
 	engine := $tmpl('./prompts/engine.md')
-	vector_vs_array := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_array_vs_vector.md') or {
+	vector_vs_array := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_array_vs_vector.md') or {
 		panic('Failed to read guides')
 	}
-	rhai_integration_fixes := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_integration_fixes.md') or {
+	rhai_integration_fixes := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_integration_fixes.md') or {
 		panic('Failed to read guides')
 	}
-	rhai_syntax_guide := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_syntax_guide.md') or {
+	rhai_syntax_guide := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_syntax_guide.md') or {
 		panic('Failed to read guides')
 	}
 	generic_wrapper_rs := $tmpl('./templates/generic_wrapper.rs')
diff --git a/lib/ai/mcp/rhai/example/example.vsh b/lib/ai/mcp/rhai/example/example.vsh
index c69391a5..b0ac996a 100755
--- a/lib/ai/mcp/rhai/example/example.vsh
+++ b/lib/ai/mcp/rhai/example/example.vsh
@@ -47,7 +47,7 @@ fn main() {
 
 	println('Task completed successfully')
 	println('The wrapper files have been generated and compiled in the target directory.')
-	println('Check /Users/timurgordon/code/git.ourworld.tf/herocode/sal/src/rhai for the compiled output.')
+	println('Check /Users/timurgordon/code/git.threefold.info/herocode/sal/src/rhai for the compiled output.')
 }
 
 // Validates command line arguments and returns the source code path
@@ -175,11 +175,11 @@ fn run_wrapper_generation_task(prompt_content string, gen RhaiGen) !string {
 // Define a Rhai wrapper generator function for Container functions
 fn create_rhai_wrappers(name string, source_code string, example_rhai string, wrapper_md string, errors_md string, crate_path string) string {
 	// Load all required template and guide files
-	guides := load_guide_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhaiwrapping_classicai.md')
+	guides := load_guide_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhaiwrapping_classicai.md')
 	engine := $tmpl('./prompts/engine.md')
-	vector_vs_array := load_guide_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_array_vs_vector.md')
-	rhai_integration_fixes := load_guide_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_integration_fixes.md')
-	rhai_syntax_guide := load_guide_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_syntax_guide.md')
+	vector_vs_array := load_guide_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_array_vs_vector.md')
+	rhai_integration_fixes := load_guide_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_integration_fixes.md')
+	rhai_syntax_guide := load_guide_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_syntax_guide.md')
 	generic_wrapper_rs := $tmpl('./templates/generic_wrapper.rs')
 
 	// Build the prompt content
diff --git a/lib/ai/mcp/rhai/logic/logic.v b/lib/ai/mcp/rhai/logic/logic.v
index 9c6dfd96..2cd149a0 100644
--- a/lib/ai/mcp/rhai/logic/logic.v
+++ b/lib/ai/mcp/rhai/logic/logic.v
@@ -67,11 +67,11 @@ pub fn rhai_wrapper_generation_prompt(name string, source_code string, source_pk
 	errors_md := os.read_file('${current_dir}/prompts/errors.md')!
 
 	// Load all required template and guide files
-	guides := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhaiwrapping_classicai.md')!
+	guides := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhaiwrapping_classicai.md')!
 	engine := $tmpl('./prompts/engine.md')
-	vector_vs_array := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_array_vs_vector.md')!
-	rhai_integration_fixes := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_integration_fixes.md')!
-	rhai_syntax_guide := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_syntax_guide.md')!
+	vector_vs_array := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_array_vs_vector.md')!
+	rhai_integration_fixes := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_integration_fixes.md')!
+	rhai_syntax_guide := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_syntax_guide.md')!
 	generic_wrapper_rs := $tmpl('./templates/generic_wrapper.rs')
 
 	prompt := $tmpl('./prompts/main.md')
diff --git a/lib/ai/mcp/rhai/logic/templates/functions.rs b/lib/ai/mcp/rhai/logic/templates/functions.rs
index 433b0435..96ec68f9 100644
--- a/lib/ai/mcp/rhai/logic/templates/functions.rs
+++ b/lib/ai/mcp/rhai/logic/templates/functions.rs
@@ -1,4 +1,4 @@
-// File: /root/code/git.ourworld.tf/herocode/sal/src/virt/nerdctl/container_builder.rs
+// File: /root/code/git.threefold.info/herocode/sal/src/virt/nerdctl/container_builder.rs
 
 use std::collections::HashMap;
 use crate::virt::nerdctl::{execute_nerdctl_command, NerdctlError};
diff --git a/lib/clients/mailclient/readme.md b/lib/clients/mailclient/readme.md
index b74b212d..d3862b36 100644
--- a/lib/clients/mailclient/readme.md
+++ b/lib/clients/mailclient/readme.md
@@ -43,7 +43,7 @@ client.send(subject:'this is a test',to:'kristof@incubaid.com',body:'
 if you have a secrets file you could import as
 
 ```bash
-//e.g.  source ~/code/git.ourworld.tf/despiegk/hero_secrets/mysecrets.sh
+//e.g.  source ~/code/git.threefold.info/despiegk/hero_secrets/mysecrets.sh
 ```
 
 following env variables are supported
diff --git a/lib/core/herocmds/mdbook.v b/lib/core/herocmds/mdbook.v
index 25ece2cd..798fa551 100644
--- a/lib/core/herocmds/mdbook.v
+++ b/lib/core/herocmds/mdbook.v
@@ -19,7 +19,7 @@ pub fn cmd_mdbook(mut cmdroot Command) {
 
 example:
 
-hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/heroscript
+hero mdbook -u https://git.threefold.info/tfgrid/info_tfgrid/src/branch/main/heroscript
 
 If you do -gp it will pull newest book content from git and give error if there are local changes.
 If you do -gr it will pull newest book content from git and overwrite local changes (careful).
diff --git a/lib/core/herocmds/run.v b/lib/core/herocmds/run.v
index 57879f3a..77dd1170 100644
--- a/lib/core/herocmds/run.v
+++ b/lib/core/herocmds/run.v
@@ -17,7 +17,7 @@ heroscript has numerous ways to execute actions using your hero tool.
 
 example:
 
-hero run -u https://git.ourworld.tf/threefold_coop/info_asimov/src/branch/main/heroscript
+hero run -u https://git.threefold.info/threefold_coop/info_asimov/src/branch/main/heroscript
 
 Can also do -e or -st to see sourcetree
 
diff --git a/lib/core/playbook/parser_test.v b/lib/core/playbook/parser_test.v
index 120919d6..f69a2feb 100644
--- a/lib/core/playbook/parser_test.v
+++ b/lib/core/playbook/parser_test.v
@@ -47,10 +47,10 @@ fn test_parser() {
 
 fn test_parser2() {
 	mut pb := new(
-		text: "!!play.run url:'https://git.ourworld.tf/despiegk/cfg/src/branch/main/myit/hetzner.md'"
+		text: "!!play.run url:'https://git.threefold.info/despiegk/cfg/src/branch/main/myit/hetzner.md'"
 	) or { panic(err) }
 	mut a := pb.actions[0]
 	assert a.actor == 'play'
 	assert a.name == 'run'
-	assert a.params.get('url')! == 'https://git.ourworld.tf/despiegk/cfg/src/branch/main/myit/hetzner.md'
+	assert a.params.get('url')! == 'https://git.threefold.info/despiegk/cfg/src/branch/main/myit/hetzner.md'
 }
diff --git a/lib/core/playcmds/_archive/play_juggler.v b/lib/core/playcmds/_archive/play_juggler.v
index 58943c5d..3689f059 100644
--- a/lib/core/playcmds/_archive/play_juggler.v
+++ b/lib/core/playcmds/_archive/play_juggler.v
@@ -27,7 +27,7 @@ pub fn play_juggler(mut plbook playbook.PlayBook) ! {
 		port := p.get_int_default('port', 8000)!
 
 		j = juggler.configure(
-			url:      'https://git.ourworld.tf/projectmycelium/itenv'
+			url:      'https://git.threefold.info/projectmycelium/itenv'
 			username: username
 			password: password
 			reset:    true
diff --git a/lib/core/playcmds/play_publisher_test.v b/lib/core/playcmds/play_publisher_test.v
index df9bbf74..fc4a1320 100644
--- a/lib/core/playcmds/play_publisher_test.v
+++ b/lib/core/playcmds/play_publisher_test.v
@@ -11,14 +11,14 @@ fn test_play_publisher() {
 	s2 := "
 
 !!publisher.new_collection
-	url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections'
+	url:'https://git.threefold.info/tfgrid/info_tfgrid/src/branch/main/collections'
 	reset: false
 	pull: true
 
 
 !!book.define 
     name:'info_tfgrid' 
-    summary_url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/development/books/tech/SUMMARY.md' 
+    summary_url:'https://git.threefold.info/tfgrid/info_tfgrid/src/branch/development/books/tech/SUMMARY.md' 
 	title:'ThreeFold Technology'
 	collections: 'about,dashboard,farmers,library,partners_utilization,tech,p2p'
 
diff --git a/lib/crypt/keychain/readme.md b/lib/crypt/keychain/readme.md
index 27ae76a6..63864b75 100644
--- a/lib/crypt/keychain/readme.md
+++ b/lib/crypt/keychain/readme.md
@@ -1,14 +1,14 @@
-security add-internet-password -s git.ourworld.tf -a despiegk -w mypassword
+security add-internet-password -s git.threefold.info -a despiegk -w mypassword
 
--s: The server (e.g., git.ourworld.tf).
+-s: The server (e.g., git.threefold.info).
 -a: The account or username (e.g., despiegk).
 -w: The password (e.g., mypassword).
 
 
-security find-internet-password -s git.ourworld.tf -w
+security find-internet-password -s git.threefold.info -w
 
 
-security delete-internet-password -s git.ourworld.tf
+security delete-internet-password -s git.threefold.info
 
 
 
diff --git a/lib/data/doctree/README.md b/lib/data/doctree/README.md
index 0ee82435..0ff35ae7 100644
--- a/lib/data/doctree/README.md
+++ b/lib/data/doctree/README.md
@@ -40,7 +40,7 @@ tree.scan(path: './docs')!
 //git_url   string
 //git_reset bool
 //git_pull  bool
-tree.scan(git_url: 'https://git.ourworld.tf/tfgrid/docs_tfgrid4/src/branch/main/collections')!
+tree.scan(git_url: 'https://git.threefold.info/tfgrid/docs_tfgrid4/src/branch/main/collections')!
 
 // 3. Export the processed content to a destination directory
 // Replace './output' with your desired output path
diff --git a/lib/data/paramsparser/params_get_kwargs_test.v b/lib/data/paramsparser/params_get_kwargs_test.v
index 38440312..ac881796 100644
--- a/lib/data/paramsparser/params_get_kwargs_test.v
+++ b/lib/data/paramsparser/params_get_kwargs_test.v
@@ -310,17 +310,17 @@ fn test_matchhashmap() {
 }
 
 fn test_url() {
-	text := "url:'https://git.ourworld.tf/despiegk/cfg/src/branch/main/myit/hetzner.md'"
+	text := "url:'https://git.threefold.info/despiegk/cfg/src/branch/main/myit/hetzner.md'"
 	params := new(text)!
 
 	myurl := params.get('url')!
-	assert myurl == 'https://git.ourworld.tf/despiegk/cfg/src/branch/main/myit/hetzner.md'
+	assert myurl == 'https://git.threefold.info/despiegk/cfg/src/branch/main/myit/hetzner.md'
 }
 
 fn test_url2() {
-	text := "url: 'https://git.ourworld.tf/despiegk/cfg/src/branch/main/myit/hetzner.md'"
+	text := "url: 'https://git.threefold.info/despiegk/cfg/src/branch/main/myit/hetzner.md'"
 	params := new(text)!
 
 	myurl := params.get('url')!
-	assert myurl == 'https://git.ourworld.tf/despiegk/cfg/src/branch/main/myit/hetzner.md'
+	assert myurl == 'https://git.threefold.info/despiegk/cfg/src/branch/main/myit/hetzner.md'
 }
diff --git a/lib/develop/gittools/README.md b/lib/develop/gittools/README.md
index 68ff30aa..2bb97cc4 100644
--- a/lib/develop/gittools/README.md
+++ b/lib/develop/gittools/README.md
@@ -10,7 +10,7 @@ mut gs := gittools.new()!
 mydocs_path:=gs.get_path(
     pull:true,
     reset:false,
-    url:'https://git.ourworld.tf/tfgrid/info_docs_depin/src/branch/main/docs'
+    url:'https://git.threefold.info/tfgrid/info_docs_depin/src/branch/main/docs'
 )!
 
 println(mydocs_path)
diff --git a/lib/develop/gittools/repository_utils.v b/lib/develop/gittools/repository_utils.v
index dd149f58..3139a9ca 100644
--- a/lib/develop/gittools/repository_utils.v
+++ b/lib/develop/gittools/repository_utils.v
@@ -35,7 +35,7 @@ pub fn (repo GitRepo) patho() !pathlib.Path {
 }
 
 // gets the path of a given url within a repo
-// ex: 'https://git.ourworld.tf/ourworld_holding/info_ourworld/src/branch/main/books/cocreation/SUMMARY.md'
+// ex: 'https://git.threefold.info/ourworld_holding/info_ourworld/src/branch/main/books/cocreation/SUMMARY.md'
 // returns <repo_path>/books/cocreation/SUMMARY.md
 pub fn (mut repo GitRepo) get_path_of_url(url string) !string {
 	// Split the URL into components
diff --git a/lib/hero/installers/publishing/command.v b/lib/hero/installers/publishing/command.v
index c4ceb537..0bddfea9 100644
--- a/lib/hero/installers/publishing/command.v
+++ b/lib/hero/installers/publishing/command.v
@@ -16,7 +16,7 @@ pub fn cmd_publisher(pre_func fn (Command) !) Command {
 
 example:
 
-hero publisher -u https://git.ourworld.tf/ourworld_holding/info_ourworld/src/branch/develop/heroscript
+hero publisher -u https://git.threefold.info/ourworld_holding/info_ourworld/src/branch/develop/heroscript
 
 If you do -gp it will pull newest book content from git and give error if there are local changes.
 If you do -gr it will pull newest book content from git and overwrite local changes (careful).
diff --git a/lib/installers/base/installer.v b/lib/installers/base/installer.v
index 936b2756..cdcbd565 100644
--- a/lib/installers/base/installer.v
+++ b/lib/installers/base/installer.v
@@ -82,9 +82,9 @@ pub fn sshkeysinstall(args InstallArgs) ! {
     then
         ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
     fi
-    if ! grep git.ourworld.tf ~/.ssh/known_hosts > /dev/null
+    if ! grep git.threefold.info ~/.ssh/known_hosts > /dev/null
     then
-        ssh-keyscan -t rsa  git.ourworld.tf >> ~/.ssh/known_hosts
+        ssh-keyscan -t rsa  git.threefold.info >> ~/.ssh/known_hosts
     fi    
     git config --global pull.rebase false
 	'
diff --git a/lib/installers/sysadmintools/actrunner/readme.md b/lib/installers/sysadmintools/actrunner/readme.md
index e8060d40..6102ef1a 100644
--- a/lib/installers/sysadmintools/actrunner/readme.md
+++ b/lib/installers/sysadmintools/actrunner/readme.md
@@ -14,7 +14,7 @@ export DOCKER_HOST=unix:///Users/despiegk1/.local/share/containers/herocontainer
 #had to install docker to get some docker tools, but was not running it
 brew install --cask docker
 cd /tmp
-git clone git@git.ourworld.tf:despiegk/test.git
+git clone git@git.threefold.info:despiegk/test.git
 cd test
 actrunner exec
 ```
diff --git a/lib/mcp/rhai/example/example copy.vsh b/lib/mcp/rhai/example/example copy.vsh
index 52d9f678..5d79814b 100644
--- a/lib/mcp/rhai/example/example copy.vsh	
+++ b/lib/mcp/rhai/example/example copy.vsh	
@@ -60,7 +60,7 @@ fn main() {
 	}
 
 	// Read the rhaiwrapping.md file
-	rhai_wrapping_md := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhaiwrapping.md') or {
+	rhai_wrapping_md := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhaiwrapping.md') or {
 		println('Failed to read rhaiwrapping.md: ${err}')
 		return
 	}
@@ -140,7 +140,7 @@ fn main() {
 
 	println('Task completed successfully')
 	println('The wrapper files have been generated and compiled in the target directory.')
-	println('Check /Users/timurgordon/code/git.ourworld.tf/herocode/sal/src/rhai for the compiled output.')
+	println('Check /Users/timurgordon/code/git.threefold.info/herocode/sal/src/rhai for the compiled output.')
 }
 
 // Define the prompt functions
@@ -158,17 +158,17 @@ fn create_example(input string) string {
 
 // Define a Rhai wrapper generator function for Container functions
 fn create_rhai_wrappers(name string, source_code string, example_rhai string, wrapper_md string, errors_md string, crate_path string) string {
-	guides := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhaiwrapping_classicai.md') or {
+	guides := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhaiwrapping_classicai.md') or {
 		panic('Failed to read guides')
 	}
 	engine := $tmpl('./prompts/engine.md')
-	vector_vs_array := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_array_vs_vector.md') or {
+	vector_vs_array := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_array_vs_vector.md') or {
 		panic('Failed to read guides')
 	}
-	rhai_integration_fixes := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_integration_fixes.md') or {
+	rhai_integration_fixes := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_integration_fixes.md') or {
 		panic('Failed to read guides')
 	}
-	rhai_syntax_guide := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_syntax_guide.md') or {
+	rhai_syntax_guide := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_syntax_guide.md') or {
 		panic('Failed to read guides')
 	}
 	generic_wrapper_rs := $tmpl('./templates/generic_wrapper.rs')
diff --git a/lib/mcp/rhai/example/example.vsh b/lib/mcp/rhai/example/example.vsh
index 23e268b7..150f0f10 100755
--- a/lib/mcp/rhai/example/example.vsh
+++ b/lib/mcp/rhai/example/example.vsh
@@ -47,7 +47,7 @@ fn main() {
 
 	println('Task completed successfully')
 	println('The wrapper files have been generated and compiled in the target directory.')
-	println('Check /Users/timurgordon/code/git.ourworld.tf/herocode/sal/src/rhai for the compiled output.')
+	println('Check /Users/timurgordon/code/git.threefold.info/herocode/sal/src/rhai for the compiled output.')
 }
 
 // Validates command line arguments and returns the source code path
@@ -175,11 +175,11 @@ fn run_wrapper_generation_task(prompt_content string, gen RhaiGen) !string {
 // Define a Rhai wrapper generator function for Container functions
 fn create_rhai_wrappers(name string, source_code string, example_rhai string, wrapper_md string, errors_md string, crate_path string) string {
 	// Load all required template and guide files
-	guides := load_guide_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhaiwrapping_classicai.md')
+	guides := load_guide_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhaiwrapping_classicai.md')
 	engine := $tmpl('./prompts/engine.md')
-	vector_vs_array := load_guide_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_array_vs_vector.md')
-	rhai_integration_fixes := load_guide_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_integration_fixes.md')
-	rhai_syntax_guide := load_guide_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_syntax_guide.md')
+	vector_vs_array := load_guide_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_array_vs_vector.md')
+	rhai_integration_fixes := load_guide_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_integration_fixes.md')
+	rhai_syntax_guide := load_guide_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_syntax_guide.md')
 	generic_wrapper_rs := $tmpl('./templates/generic_wrapper.rs')
 
 	// Build the prompt content
diff --git a/lib/mcp/rhai/logic/logic.v b/lib/mcp/rhai/logic/logic.v
index aaeac298..28d92ed1 100644
--- a/lib/mcp/rhai/logic/logic.v
+++ b/lib/mcp/rhai/logic/logic.v
@@ -63,11 +63,11 @@ pub fn rhai_wrapper_generation_prompt(name string, source_code string) !string {
 	errors_md := os.read_file('${current_dir}/prompts/errors.md') or { panic(err) }
 
 	// Load all required template and guide files
-	guides := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhaiwrapping_classicai.md')!
+	guides := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhaiwrapping_classicai.md')!
 	engine := $tmpl('./prompts/engine.md')
-	vector_vs_array := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_array_vs_vector.md')!
-	rhai_integration_fixes := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_integration_fixes.md')!
-	rhai_syntax_guide := os.read_file('/Users/timurgordon/code/git.ourworld.tf/herocode/sal/aiprompts/rhai_syntax_guide.md')!
+	vector_vs_array := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_array_vs_vector.md')!
+	rhai_integration_fixes := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_integration_fixes.md')!
+	rhai_syntax_guide := os.read_file('/Users/timurgordon/code/git.threefold.info/herocode/sal/aiprompts/rhai_syntax_guide.md')!
 	generic_wrapper_rs := $tmpl('./templates/generic_wrapper.rs')
 
 	prompt := $tmpl('./prompts/main.md')
diff --git a/lib/mcp/rhai/logic/templates/functions.rs b/lib/mcp/rhai/logic/templates/functions.rs
index 433b0435..96ec68f9 100644
--- a/lib/mcp/rhai/logic/templates/functions.rs
+++ b/lib/mcp/rhai/logic/templates/functions.rs
@@ -1,4 +1,4 @@
-// File: /root/code/git.ourworld.tf/herocode/sal/src/virt/nerdctl/container_builder.rs
+// File: /root/code/git.threefold.info/herocode/sal/src/virt/nerdctl/container_builder.rs
 
 use std::collections::HashMap;
 use crate::virt::nerdctl::{execute_nerdctl_command, NerdctlError};
diff --git a/lib/web/doctreeclient/doctree_test.v b/lib/web/doctreeclient/doctree_test.v
index ea59254c..541a090b 100644
--- a/lib/web/doctreeclient/doctree_test.v
+++ b/lib/web/doctreeclient/doctree_test.v
@@ -12,7 +12,7 @@ fn test_doctree_client() ! {
 	mut tree := doctree.new(name: 'test')!
 
 	tree.scan(
-		git_url:  'https://git.ourworld.tf/tfgrid/docs_tfgrid4/src/branch/main/collections'
+		git_url:  'https://git.threefold.info/tfgrid/docs_tfgrid4/src/branch/main/collections'
 		git_pull: false
 	)!
 
diff --git a/lib/web/docusaurus/templates/example.heroscript b/lib/web/docusaurus/templates/example.heroscript
index 0845a63a..7b067d1e 100644
--- a/lib/web/docusaurus/templates/example.heroscript
+++ b/lib/web/docusaurus/templates/example.heroscript
@@ -22,7 +22,7 @@
 !!docusaurus.ssh_connection name:'main' host:'info.ourworld.tf' port:'21' login:'root' passwd:'' key_path:'' key:''
 
 !!docusaurus.import_source
-        url:'https://git.ourworld.tf/ourworld_holding/info_docs_owh/src/branch/main/docs'
+        url:'https://git.threefold.info/ourworld_holding/info_docs_owh/src/branch/main/docs'
         path:''
         dest:'' //if empty is root of docs
         replace:'NAME:MyName, URGENCY:red'