diff --git a/.devcontainer/scripts/postCreate.sh b/.devcontainer/scripts/postCreate.sh
index 93a796821..df30f0da6 100644
--- a/.devcontainer/scripts/postCreate.sh
+++ b/.devcontainer/scripts/postCreate.sh
@@ -3,10 +3,14 @@
 # specify how to reconcile divergent branches
 git config pull.rebase false # merge
 
+# add gcloud gpg key
+curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg || true
+echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
+
 # update/install apt packages
 sudo apt-get -y --no-install-recommends update &&
   sudo apt-get -y --no-install-recommends upgrade &&
-  sudo apt-get -y --no-install-recommends install bash-completion &&
+  sudo apt-get -y --no-install-recommends install bash-completion google-cloud-cli &&
   sudo rm -rf /var/lib/apt/lists/*
 
 # create env folder
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 506f963b4..92a821e11 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -43,55 +43,5 @@
   "[jsonc]": {
     "editor.defaultFormatter": "vscode.json-language-features"
   },
-  "dbt.enableNewLineagePanel": true,
-  "dbt.deferConfigPerProject": {
-    "src/dbt/deanslist": {
-      "manifestPathForDeferral": "/workspaces/teamster/src/dbt/deanslist/target",
-      "manifestPathType": "local"
-    },
-    "src/dbt/edplan": {
-      "manifestPathForDeferral": "/workspaces/teamster/src/dbt/edplan/target",
-      "manifestPathType": "local"
-    },
-    "src/dbt/iready": {
-      "manifestPathForDeferral": "/workspaces/teamster/src/dbt/iready/target",
-      "manifestPathType": "local"
-    },
-    "src/dbt/kippcamden": {
-      "manifestPathForDeferral": "/workspaces/teamster/src/dbt/kippcamden/target",
-      "manifestPathType": "local"
-    },
-    "src/dbt/kippmiami": {
-      "manifestPathForDeferral": "/workspaces/teamster/src/dbt/kippmiami/target",
-      "manifestPathType": "local"
-    },
-    "src/dbt/kippnewark": {
-      "manifestPathForDeferral": "/workspaces/teamster/src/dbt/kippnewark/target",
-      "manifestPathType": "local"
-    },
-    "src/dbt/kipptaf": {
-      "manifestPathForDeferral": "/workspaces/teamster/src/dbt/kipptaf/target",
-      "manifestPathType": "local"
-    },
-    "src/dbt/overgrad": {
-      "manifestPathForDeferral": "/workspaces/teamster/src/dbt/overgrad/target",
-      "manifestPathType": "local"
-    },
-    "src/dbt/pearson": {
-      "manifestPathForDeferral": "/workspaces/teamster/src/dbt/pearson/target",
-      "manifestPathType": "local"
-    },
-    "src/dbt/powerschool": {
-      "manifestPathForDeferral": "/workspaces/teamster/src/dbt/powerschool/target",
-      "manifestPathType": "local"
-    },
-    "src/dbt/renlearn": {
-      "manifestPathForDeferral": "/workspaces/teamster/src/dbt/renlearn/target",
-      "manifestPathType": "local"
-    },
-    "src/dbt/titan": {
-      "manifestPathForDeferral": "/workspaces/teamster/src/dbt/titan/target",
-      "manifestPathType": "local"
-    }
-  }
+  "dbt.enableNewLineagePanel": true
 }
diff --git a/src/dbt/kipptaf/models/adp/workforce_now/intermediate/int_adp_workforce_now__person_communication_pivot.sql b/src/dbt/kipptaf/models/adp/workforce_now/intermediate/int_adp_workforce_now__person_communication_pivot.sql
index ffcada742..257b991ab 100644
--- a/src/dbt/kipptaf/models/adp/workforce_now/intermediate/int_adp_workforce_now__person_communication_pivot.sql
+++ b/src/dbt/kipptaf/models/adp/workforce_now/intermediate/int_adp_workforce_now__person_communication_pivot.sql
@@ -22,7 +22,7 @@ with
             *,
 
             regexp_extract(
-                _dbt_source_relation, r'(\w+)_communication'
+                _dbt_source_relation, r'__(\w+)_communication'
             ) as source_relation_type,
         from union_relations
     ),