diff --git a/.github/workflows/initialize-edge-app.yml b/.github/workflows/initialize-edge-app.yml
index 990d5e1..1cecf61 100644
--- a/.github/workflows/initialize-edge-app.yml
+++ b/.github/workflows/initialize-edge-app.yml
@@ -51,9 +51,10 @@ jobs:
                       | "\(.name) (\(.domain))"'
           )
           echo "Current team: ${current_team}"
-      - uses: Screenly/edge-apps-actions/initialize@v1
+      - uses: Screenly/edge-apps-actions/initialize@f4ccd2bd50db5fb0a5147d287ac03cafe552d29b
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN }}
           edge_app_name: ${{ inputs.edge_app_name }}
           edge_app_title: ${{ inputs.edge_app_title }}
           environment: ${{ inputs.environment }}
+          edge_app_id: ${{ secrets.EDGE_APP_ID || (inputs.environment == 'production' && vars.PRODUCTION_EDGE_APP_ID || (inputs.environment == 'stage' && vars.STAGE_EDGE_APP_ID)) }}
diff --git a/.github/workflows/update-edge-app.yml b/.github/workflows/update-edge-app.yml
index ad6fb7d..13bb774 100644
--- a/.github/workflows/update-edge-app.yml
+++ b/.github/workflows/update-edge-app.yml
@@ -36,11 +36,12 @@ jobs:
                       | "\(.name) (\(.domain))"'
           )
           echo "Current team: ${current_team}"
-      - uses: Screenly/edge-apps-actions/update@v1
+      - uses: Screenly/edge-apps-actions/update@f4ccd2bd50db5fb0a5147d287ac03cafe552d29b
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN }}
           environment: stage
           delete_missing_settings: 'true'
+          edge_app_id: ${{ secrets.EDGE_APP_ID || vars.STAGE_EDGE_APP_ID }}
 
   deploy-production:
     name: Updating Salesforce App in production
@@ -68,8 +69,9 @@ jobs:
                       | "\(.name) (\(.domain))"'
           )
           echo "Current team: ${current_team}"
-      - uses: Screenly/edge-apps-actions/update@v1
+      - uses: Screenly/edge-apps-actions/update@f4ccd2bd50db5fb0a5147d287ac03cafe552d29b
         with:
           screenly_api_token: ${{ secrets.SCREENLY_API_TOKEN }}
           environment: production
           delete_missing_settings: 'true'
+          edge_app_id: ${{ secrets.EDGE_APP_ID || vars.PRODUCTION_EDGE_APP_ID }}
diff --git a/screenly.yml b/screenly.yml
index b5b1804..289a69c 100644
--- a/screenly.yml
+++ b/screenly.yml
@@ -1,6 +1,5 @@
 ---
 syntax: manifest_v1
-id: 01KRZ194MADE1FJAAH0V3G85A7
 description: Display Salesforce dashboards and reports on your Screenly screens
 icon: https://playground.srly.io/edge-apps/icons/salesforce.svg
 author: Screenly, Inc.
diff --git a/screenly_qc.yml b/screenly_qc.yml
deleted file mode 100644
index 92a6a41..0000000
--- a/screenly_qc.yml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-syntax: manifest_v1
-id: 01KRXVZKYWTWG0DYPE9VBV87MY
-description: Display Salesforce dashboards and reports on your Screenly screens
-icon: https://playground.srly.io/edge-apps/icons/salesforce.svg
-author: Screenly, Inc.
-categories:
-- Dashboards
-- Report
-ready_signal: true
-settings:
-  access_token:
-    type: secret
-    title: Access Token
-    optional: true
-    help_text:
-      properties:
-        help_text: For testing only. In production, the access token should be fetched dynamically via the API.
-        type: oauth:salesforce:access_token
-      schema_version: 1
-  content_id:
-    type: string
-    title: Content ID
-    optional: false
-    help_text:
-      properties:
-        help_text: Select the Salesforce dashboard or report to display.
-        type: oauth:salesforce:resource_id
-      schema_version: 1
-  display_errors:
-    type: string
-    default_value: 'false'
-    title: Display Errors
-    optional: true
-    help_text:
-      properties:
-        advanced: true
-        help_text: For debugging purposes to display errors on the screen.
-        type: boolean
-      schema_version: 1
-  refresh_interval:
-    type: string
-    default_value: '300'
-    title: Refresh Interval (seconds)
-    optional: true
-    help_text:
-      properties:
-        advanced: true
-        help_text: How often to refresh Salesforce data. Defaults to 300 seconds (5 minutes).
-        type: number
-      schema_version: 1
-  sentry_dsn:
-    type: secret
-    title: Sentry DSN
-    optional: true
-    is_global: true
-    help_text:
-      properties:
-        advanced: true
-        help_text: Sentry DSN for reporting credential and content-load errors. Leave empty to disable.
-        type: string
-      schema_version: 1
-  show_labels:
-    type: string
-    default_value: 'false'
-    title: Show Labels
-    optional: true
-    help_text:
-      properties:
-        help_text: Show data labels on charts and gauges.
-        type: boolean
-      schema_version: 1