diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f34d1f9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "components/zinit"]
+	path = components/zinit
+	url = https://github.com/threefoldtech/zinit.git
+[submodule "components/rfs"]
+	path = components/rfs
+	url = https://github.com/threefoldtech/rfs.git
+[submodule "components/mycelium"]
+	path = components/mycelium
+	url = https://github.com/threefoldtech/mycelium.git
diff --git a/components/corex/corex b/components/corex/corex
new file mode 100755
index 0000000..53ee7ab
Binary files /dev/null and b/components/corex/corex differ
diff --git a/components/mycelium b/components/mycelium
new file mode 160000
index 0000000..a9ba23d
--- /dev/null
+++ b/components/mycelium
@@ -0,0 +1 @@
+Subproject commit a9ba23d7bd020411be51cd2359775f6f11b159e4
diff --git a/components/rfs b/components/rfs
new file mode 160000
index 0000000..9a1ae06
--- /dev/null
+++ b/components/rfs
@@ -0,0 +1 @@
+Subproject commit 9a1ae0620d38b1638231de031d46c9afaa851793
diff --git a/components/zinit b/components/zinit
new file mode 160000
index 0000000..1b76c06
--- /dev/null
+++ b/components/zinit
@@ -0,0 +1 @@
+Subproject commit 1b76c062fe31d552d1b7b23484ce163995a81482
diff --git a/scripts/setup-submodules.sh b/scripts/setup-submodules.sh
index fb11a29..77fda17 100755
--- a/scripts/setup-submodules.sh
+++ b/scripts/setup-submodules.sh
@@ -34,12 +34,12 @@ else
     echo "    rfs submodule already exists"
 fi
 
-# 3. Mycelium - tag 0.6.1 (musl build)
-echo "  Adding mycelium (networking layer) tag 0.6.1..."
+# 3. Mycelium - tag v0.6.1 (musl build)
+echo "  Adding mycelium (networking layer) tag v0.6.1..."
 if [ ! -d "components/mycelium" ]; then
     git submodule add https://github.com/threefoldtech/mycelium.git components/mycelium
     cd components/mycelium
-    git checkout 0.6.1
+    git checkout v0.6.1
     cd ../..
 else
     echo "    mycelium submodule already exists"
@@ -66,7 +66,7 @@ echo ""
 echo "Components added:"
 echo "  - zinit (master): $(ls -la components/zinit 2>/dev/null | wc -l) files"
 echo "  - rfs (v2.0.6): $(ls -la components/rfs 2>/dev/null | wc -l) files"
-echo "  - mycelium (0.6.1): $(ls -la components/mycelium 2>/dev/null | wc -l) files"
+echo "  - mycelium (v0.6.1): $(ls -la components/mycelium 2>/dev/null | wc -l) files"
 echo "  - corex (v2.1.4): $(ls -la components/corex/corex 2>/dev/null && echo "downloaded" || echo "missing")"
 echo ""
 echo "To update submodules later, run:"