diff --git a/.github/workflows/initialize-edge-app.yml b/.github/workflows/initialize-edge-app.yml
index 29fce8e..48932f3 100644
--- a/.github/workflows/initialize-edge-app.yml
+++ b/.github/workflows/initialize-edge-app.yml
@@ -32,9 +32,10 @@ jobs:
       - uses: actions/checkout@v7
         with:
           ref: ${{ inputs.environment == 'production' && 'main' || github.ref }}
-      - 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 1ecb4a1..723546a 100644
--- a/.github/workflows/update-edge-app.yml
+++ b/.github/workflows/update-edge-app.yml
@@ -18,11 +18,12 @@ jobs:
     environment: stage
     steps:
       - uses: actions/checkout@v7
-      - 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 Calendar App in production
@@ -31,8 +32,9 @@ jobs:
     environment: production
     steps:
       - uses: actions/checkout@v7
-      - 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 f5b6bd5..e6268ae 100644
--- a/screenly.yml
+++ b/screenly.yml
@@ -1,6 +1,5 @@
 ---
 syntax: manifest_v1
-id: 01JY4ARF0H5TAWWEG24KJGW33X
 description: Screenly Calendar Edge App
 icon: https://playground.srly.io/edge-apps/calendar/static/img/icon.svg
 author: Screenly, Inc.
diff --git a/screenly_qc.yml b/screenly_qc.yml
deleted file mode 100644
index 85a394f..0000000
--- a/screenly_qc.yml
+++ /dev/null
@@ -1,77 +0,0 @@
----
-syntax: manifest_v1
-id: 01JZHNQJRE2D6PB67HQHWG6PKA
-description: Screenly Calendar Edge App QC
-icon: https://playground.srly.io/edge-apps/calendar/static/img/icon.svg
-author: Screenly, Inc.
-categories:
-  - Productivity
-  - Utilities
-ready_signal: true
-settings:
-  bypass_cors:
-    type: string
-    default_value: 'true'
-    title: Bypass CORS
-    optional: true
-    help_text: |
-      Enable CORS bypass for iCal URLs that require it to resolve access restrictions.
-  calendar_mode:
-    type: string
-    default_value: schedule
-    title: Calendar Mode
-    optional: true
-    help_text:
-      properties:
-        help_text: Select the calendar view mode.
-        options:
-          - label: Schedule
-            value: schedule
-          - label: Weekly
-            value: weekly
-          - label: Daily
-            value: daily
-        type: select
-      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
-  ical_url:
-    type: secret
-    title: iCal URL
-    optional: false
-    help_text: |
-      Enter the public iCal feed URL for your calendar.
-  override_locale:
-    type: string
-    default_value: en
-    title: Override Locale
-    optional: true
-    help_text: |
-      Enter the locale to override the default locale for the calendar.
-      If left blank, the default locale will be used.
-      Example: 'fr'
-  override_timezone:
-    type: string
-    default_value: ''
-    title: Override Timezone
-    optional: true
-    help_text: |
-      Enter the timezone to override the default timezone for the calendar.
-      If left blank, the default timezone will be used.
-      Example: 'America/New_York'
-  sentry_dsn:
-    type: secret
-    title: Sentry Client Key
-    optional: true
-    help_text: |
-      Enter your Sentry DSN to enable error tracking and monitoring.
-    is_global: true