diff --git a/.github/workflows/arm-ttk.yml b/.github/workflows/arm-ttk.yml
index 1c437c1ed..4648901bf 100644
--- a/.github/workflows/arm-ttk.yml
+++ b/.github/workflows/arm-ttk.yml
@@ -39,7 +39,14 @@ jobs:
               repo: context.repo.repo,
               labels: ['arm-templates']
             })
+
       - uses: actions/checkout@v3.5.3
+        with:
+          submodules: recursive
+
+      - name: Generate ARM file
+        working-directory: templates/azure
+        run: az bicep build --file azuredeploy.bicep --outfile azuredeploy.json 
 
       - name: Checkout Azure/arm-ttk
         uses: actions/checkout@v3.5.3
@@ -47,17 +54,6 @@ jobs:
           repository: Azure/arm-ttk
           path: arm-ttk
 
-      - name: Checkout Azure/iotedge-lorawan-starterkit
-        uses: actions/checkout@v3.5.3
-        with: 
-          repository: Azure/iotedge-lorawan-starterkit
-          ref: dev
-          path: templates/iotedge-lorawan-starterkit
-
-      - name: Generate ARM file
-        working-directory: templates/azure
-        run: az bicep build --file azuredeploy.bicep --outfile azuredeploy.json 
-          
       - name: Run arm-ttk
         shell: pwsh
         run: |
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 9cefa5ec9..c1152d95f 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -104,13 +104,7 @@ jobs:
       - uses: actions/checkout@v3.5.3
         with:
           path: IoT-Hub-Portal
-
-      - name: Checkout Azure/iotedge-lorawan-starterkit
-        uses: actions/checkout@v3.5.3
-        with: 
-          repository: Azure/iotedge-lorawan-starterkit
-          ref: dev
-          path: iotedge-lorawan-starterkit
+          submodules: recursive
 
       - uses: actions/checkout@v3.5.3
         with:
@@ -131,7 +125,8 @@ jobs:
             mkdir -p templates/azure/iotedge-lorawan-starterkit
             touch ./templates/.gitkeep
             cp -r ../IoT-Hub-Portal/templates/* ./templates/
-            cp -r ../iotedge-lorawan-starterkit/TemplateBicep/* ./templates/azure/iotedge-lorawan-starterkit/
+            rm -rf ./templates/iotedge-lorawan-starterkit/
+            cp -r ../IoT-Hub-Portal/templates/iotedge-lorawan-starterkit/TemplateBicep/* ./templates/azure/iotedge-lorawan-starterkit/
             sed -r -i 's/..\/iotedge-lorawan-starterkit\/TemplateBicep\/main.bicep/.\/iotedge-lorawan-starterkit\/main.bicep/g' ./templates/azure/portal_with_lorawan_and_starter_kit.bicep
       
       - name: Update IoTHub Portal docker image tag in app_service.bicep
diff --git a/.gitignore b/.gitignore
index 20dcd6dba..bc51cf397 100644
--- a/.gitignore
+++ b/.gitignore
@@ -317,6 +317,4 @@ Temporary Items
 # End of https://www.toptal.com/developers/gitignore/api/macos
 src/IoTHub.Portal/Client/assets/package-lock.json
 
-# Folder for iotedge-lorawan-starterkit bicep templates
-iotedge-lorawan-starterkit/
 **/appsettings.Development.json
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..f3ca7695b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "templates/iotedge-lorawan-starterkit"]
+	path = templates/iotedge-lorawan-starterkit
+	url = https://github.com/Azure/iotedge-lorawan-starterkit.git
+	branch = dev
diff --git a/templates/iotedge-lorawan-starterkit b/templates/iotedge-lorawan-starterkit
new file mode 160000
index 000000000..d9848b6d0
--- /dev/null
+++ b/templates/iotedge-lorawan-starterkit
@@ -0,0 +1 @@
+Subproject commit d9848b6d0e6bd808b30c5cef3be5f7deb571bce6