diff --git a/iac/codeql-extractor.yml b/iac/codeql-extractor.yml
index 2e79ae192fb2..59628a34382f 100644
--- a/iac/codeql-extractor.yml
+++ b/iac/codeql-extractor.yml
@@ -10,6 +10,9 @@ scc_languages:
   - HCL
   - Docker
 
+build_modes:
+  - none
+
 # File types
 file_types:
   - name: hcl
diff --git a/iac/ql/lib/qlpack.yml b/iac/ql/lib/qlpack.yml
index 7ccbd8beedb7..047ad4f1fbaf 100644
--- a/iac/ql/lib/qlpack.yml
+++ b/iac/ql/lib/qlpack.yml
@@ -1,13 +1,17 @@
----
-library: true
-warnOnImplicitThis: true
-name: advanced-security/iac-all
-version: 0.5.1
-dependencies:
-  codeql/util: ^1.0.12
-  codeql/yaml: ^1.0.25
+name: microsoft/iac-all
+version: 0.0.1
+groups: 
+  - iac
+  - microsoft-all
 dbscheme: iac.dbscheme
 extractor: iac
+library: true
 upgrades: upgrades
-groups:
- - iac
+dependencies:
+  codeql/controlflow: ${workspace}
+  codeql/dataflow: ${workspace}
+  codeql/ssa: ${workspace}
+  codeql/util: ${workspace}
+  codeql/mad: ${workspace}
+  codeql/yaml: ${workspace}
+warnOnImplicitThis: true
diff --git a/iac/ql/src/qlpack.yml b/iac/ql/src/qlpack.yml
index 461f8ef35b4f..576915a22461 100644
--- a/iac/ql/src/qlpack.yml
+++ b/iac/ql/src/qlpack.yml
@@ -1,10 +1,11 @@
-name: advanced-security/iac-queries
-version: 0.5.1
-groups: 
+name: microsoft/iac-queries
+version: 0.0.1
+groups:
   - iac
+  - microsoft-all
   - queries
-dependencies:
-  advanced-security/iac-all: ${workspace}
 extractor: iac
+dependencies:
+  microsoft/iac-all: ${workspace}
+  codeql/suite-helpers: ${workspace}
 warnOnImplicitThis: true
-defaultSuiteFile: codeql-suites/iac-code-scanning.qls