diff --git a/.github/workflows/initialize-edge-app.yml b/.github/workflows/initialize-edge-app.yml
index 82bd1fa..f7808a8 100644
--- a/.github/workflows/initialize-edge-app.yml
+++ b/.github/workflows/initialize-edge-app.yml
@@ -32,9 +32,10 @@ jobs:
       - uses: actions/checkout@v6
         with:
           ref: main
-      - 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 6b6915f..9181ede 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@v6
-      - 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 RSS Reader in production
@@ -31,8 +32,9 @@ jobs:
     environment: production
     steps:
       - uses: actions/checkout@v6
-      - 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 19a81ea..7bdd71a 100644
--- a/screenly.yml
+++ b/screenly.yml
@@ -1,6 +1,5 @@
 ---
 syntax: manifest_v1
-id: 01HKT5KJPAHVGYJSFQF80BCJYQ
 description: Screenly RSS Reader App
 icon: https://playground.srly.io/edge-apps/icons/rss-reader.svg
 author: Screenly, Inc.
diff --git a/screenly_qc.yml b/screenly_qc.yml
deleted file mode 100644
index c94e8e3..0000000
--- a/screenly_qc.yml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-syntax: manifest_v1
-id: 01JZHNYXGAR1SN3876MZNQFDXJ
-description: Screenly RSS Reader App
-icon: https://playground.srly.io/edge-apps/icons/rss-reader.svg
-author: Screenly, Inc.
-categories:
-  - Utilities
-ready_signal: true
-settings:
-  bypass_cors:
-    type: string
-    default_value: 'true'
-    title: Bypass CORS
-    optional: true
-    help_text: |
-      Some RSS sources require you to bypass CORS policies.
-      Setting this to 'true' enables this feature.
-  cache_interval:
-    type: string
-    default_value: '1800'
-    title: Cache Interval
-    optional: false
-    help_text: |
-      Specify the interval (in seconds) used to periodically cache feeds.
-  display_errors:
-    type: string
-    default_value: 'false'
-    title: Display Errors
-    optional: true
-    help_text:
-      schema_version: 1
-      properties:
-        advanced: true
-        help_text: For debugging purposes to display errors on the screen.
-        type: boolean
-  enable_analytics:
-    type: string
-    default_value: 'true'
-    title: Enable Analytics
-    optional: true
-    help_text: Whether to enable analytics or not
-    is_global: true
-  override_locale:
-    type: string
-    default_value: en
-    title: Override Locale
-    optional: true
-    help_text: |
-      Override the default locale with a supported language code (e.g., en, fr, de). Defaults to English if not specified.
-      You can find the available locales here: https://momentjs.com/
-  override_timezone:
-    type: string
-    default_value: ''
-    title: Override Timezone
-    optional: true
-    help_text: |
-      Override the default timezone with a supported timezone identifier (e.g., Europe/London, America/New_York). Defaults to the system timezone if left blank.
-      You can find the available timezones here: https://momentjs.com/timezone/
-  rss_title:
-    type: string
-    default_value: BBC News
-    title: RSS Title
-    optional: false
-    help_text: The source label displayed on each card, default is `BBC News`.
-  rss_url:
-    type: string
-    default_value: http://feeds.bbci.co.uk/news/rss.xml
-    title: RSS URL
-    optional: false
-    help_text: |
-      Enter the URL of the RSS feed you want to display, default is `BBC News`.
-  tag_manager_id:
-    type: string
-    default_value: GTM-P98SPZ9Z
-    title: Google Tag Manager ID
-    optional: true
-    help_text: Specify a Google Tag Manager ID
-    is_global: true
-  sentry_dsn:
-    type: secret
-    title: Sentry Client Key
-    optional: true
-    help_text: Sentry Client Key from Sentry SDK for error capturing.
-    is_global: true