diff --git a/.github/workflows/dbt_staging.yml b/.github/workflows/dbt_staging.yml
index e4ff4bd..27e98ff 100644
--- a/.github/workflows/dbt_staging.yml
+++ b/.github/workflows/dbt_staging.yml
@@ -32,9 +32,9 @@ jobs:
       - name: dbt deps
         run: dbt deps
 
-      - name: Find Current Pull Request
-        uses: jwalton/gh-find-current-pr@v1.3.0
-        id: findPR
+      # - name: Find Current Pull Request
+      #   uses: jwalton/gh-find-current-pr@v1.3.0
+      #   id: findPR
 
       # TODO: update for your unique S3 bucket name
       # TODO: update your GitHub secrets to include AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
@@ -53,7 +53,7 @@ jobs:
           SNOWFLAKE_USER: ${{ secrets.SNOWFLAKE_USER }}
           SNOWFLAKE_PASSWORD: ${{ secrets.SNOWFLAKE_PASSWORD }}
           SNOWFLAKE_ROLE: ${{ secrets.SNOWFLAKE_ROLE }}
-          SNOWFLAKE_SCHEMA: "${{ format('{0}_{1}', 'PR_NUM', steps.findPr.outputs.pr) }}"
+          SNOWFLAKE_SCHEMA: "${{ format('{0}_{1}', 'PR_NUM', github.event.pull_request.number) }}"
 
       # TODO: comment this step out if you don't have Datafold Cloud yet
       # TODO: replace --ci-config-id 345 with your unique datafold ci config id
diff --git a/models/core/dim_orgs.sql b/models/core/dim_orgs.sql
index 73beb44..5d2262d 100644
--- a/models/core/dim_orgs.sql
+++ b/models/core/dim_orgs.sql
@@ -2,9 +2,10 @@ WITH orgs AS (
 --prod
     SELECT
         org_id
-        , MIN(event_timestamp) AS created_at
-    FROM {{ ref('signed_in') }}
-    GROUP BY 1
+        , org_name
+        , employee_range
+        , created_at
+    FROM {{ ref('org_created') }}
 
 -- --dev
 --    SELECT
@@ -28,7 +29,7 @@ WITH orgs AS (
         org_id
         , event_timestamp AS sub_created_at
         , plan as sub_plan
-        , price as sub_price
+        , coalesce(price, 0) as sub_price
     FROM {{ ref('subscription_created') }}
 )
 
@@ -38,8 +39,8 @@ SELECT
     , created_at
     , num_users
     , sub_created_at
-    , sub_plan
+    , case when num_users = 1 then 'Individual' else sub_plan end as sub_plan
     , sub_price
 FROM orgs
 LEFT JOIN user_count USING (org_id)
-LEFT JOIN subscriptions USING (org_id) 
+LEFT JOIN subscriptions USING (org_id)