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 a2648e5..54a4ab9 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 Simple Message 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 3f3934e..e54e6a0 100644
--- a/screenly.yml
+++ b/screenly.yml
@@ -1,6 +1,5 @@
 ---
 syntax: manifest_v1
-id: 01HTYXDZVA532Z1GN4CX5Z7VH7
 description: Screenly Simple Message App
 icon: https://playground.srly.io/edge-apps/simple-message-app/static/img/icon.svg
 author: Screenly, Inc.
diff --git a/screenly_qc.yml b/screenly_qc.yml
deleted file mode 100644
index 97b9193..0000000
--- a/screenly_qc.yml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-syntax: manifest_v1
-id: 01JZHP34BQWKHFN9KPT0W0MH2N
-description: Screenly Simple Message App QC
-icon: https://playground.srly.io/edge-apps/simple-message-app/static/img/icon.svg
-author: Screenly, Inc.
-categories:
-  - Utilities
-  - Messaging & Content
-ready_signal: true
-settings:
-  enable_analytics:
-    type: string
-    default_value: 'true'
-    title: Enable Analytics
-    optional: true
-    help_text: Enable or disable Sentry and Google Analytics integrations.
-    is_global: true
-  message_body:
-    type: string
-    default_value: |
-      A simple message app allows users to display text on a screen, making it a
-      basic tool for digital signage. Users can input and edit both the heading
-      and message body directly from the Screenly dashboard.
-    title: Message Body
-    optional: false
-    help_text: |
-      Enter the main text content that will be displayed in the message body.
-  message_header:
-    type: string
-    default_value: Simple Message App
-    title: Message Header
-    optional: false
-    help_text: |
-      Enter the headline text that will be displayed as the message title.
-  override_locale:
-    type: string
-    default_value: en
-    title: Override Locale
-    optional: true
-    help_text: |
-      Override the default locale with a supported BCP 47 language tag (e.g., en, fr, de). Defaults to English if not specified.
-      For more details on valid locale identifiers, see the Intl locales argument documentation: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Intl#locales_argument
-  override_timezone:
-    type: string
-    default_value: ''
-    title: Override Timezone
-    optional: true
-    help_text: |
-      Override the default timezone with a supported IANA timezone identifier (e.g., Europe/London, America/New_York). Defaults to the system timezone if left blank.
-      You can find the list of IANA timezones here: https://www.iana.org/time-zones
-  tag_manager_id:
-    type: string
-    default_value: GTM-P98SPZ9Z
-    title: Google Tag Manager ID
-    optional: true
-    help_text: |
-      Enter your Google Tag Manager container ID to enable tracking and analytics.
-    is_global: true