diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 4a7567498..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,5 +0,0 @@
-[submodule "aztfmod"]
-	path = aztfmod
-	url = https://github.com/aztfmod/terraform-azurerm-caf.git
-	branch = 5.6.3
-	ignore = all
\ No newline at end of file
diff --git a/aztfmod b/aztfmod
deleted file mode 160000
index 6cf965a93..000000000
--- a/aztfmod
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6cf965a9310cb1fe2108ff73e49c92ae46322993
diff --git a/caf_launchpad/dynamic_secrets.tf b/caf_launchpad/dynamic_secrets.tf
index 4a54fa539..a2a021d32 100644
--- a/caf_launchpad/dynamic_secrets.tf
+++ b/caf_launchpad/dynamic_secrets.tf
@@ -1,6 +1,7 @@
 
 module "dynamic_keyvault_secrets" {
-  source = "../aztfmod/modules/security/dynamic_keyvault_secrets"
+  source  = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
+  version = "5.6.3"
 
   for_each = try(var.dynamic_keyvault_secrets, {})
 
diff --git a/caf_launchpad/landingzone.tf b/caf_launchpad/landingzone.tf
index 3c039466a..f699d6b3c 100644
--- a/caf_launchpad/landingzone.tf
+++ b/caf_launchpad/landingzone.tf
@@ -1,5 +1,6 @@
 module "launchpad" {
-  source = "../aztfmod"
+  source  = "aztfmod/caf/azurerm"
+  version = "5.6.3"
 
   providers = {
     azurerm.vhub = azurerm.vhub
diff --git a/caf_solution/dynamic_secrets.tf b/caf_solution/dynamic_secrets.tf
index e3b4abd2a..ebde1703b 100644
--- a/caf_solution/dynamic_secrets.tf
+++ b/caf_solution/dynamic_secrets.tf
@@ -1,5 +1,6 @@
 module "dynamic_keyvault_secrets" {
-  source = "../aztfmod/modules/security/dynamic_keyvault_secrets"
+  source  = "aztfmod/caf/azurerm//modules/security/dynamic_keyvault_secrets"
+  version = "5.6.3"
 
   for_each = {
     for keyvault_key, secrets in try(var.dynamic_keyvault_secrets, {}) : keyvault_key => {
diff --git a/caf_solution/landingzone.tf b/caf_solution/landingzone.tf
index ad858c0a7..65c86c982 100644
--- a/caf_solution/landingzone.tf
+++ b/caf_solution/landingzone.tf
@@ -1,5 +1,6 @@
 module "solution" {
-  source = "../aztfmod"
+  source  = "aztfmod/caf/azurerm"
+  version = "5.6.3"
 
   providers = {
     azurerm.vhub = azurerm.vhub