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 7f4615d..4c5d028 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 Timer 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 91429fa..e3a272b 100644
--- a/screenly.yml
+++ b/screenly.yml
@@ -1,6 +1,5 @@
 ---
 syntax: manifest_v1
-id: 01KHKD38EETEJEB0CE3W4YSXFH
 description: Screenly Simple Timer Edge App
 icon: https://playground.srly.io/edge-apps/simple-timer/static/img/icon.svg
 author: Screenly, Inc.
diff --git a/screenly_qc.yml b/screenly_qc.yml
deleted file mode 100644
index 42e6b90..0000000
--- a/screenly_qc.yml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-syntax: manifest_v1
-id: 01KH99TGY1GXS962W1NYRQMV8N
-description: Screenly Simple Timer Edge App
-icon: https://playground.srly.io/edge-apps/simple-timer/static/img/icon.svg
-author: Screenly, Inc.
-categories:
-  - Utilities
-  - Productivity
-ready_signal: true
-settings:
-  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
-  duration:
-    type: string
-    default_value: '60'
-    title: Duration
-    optional: false
-    help_text:
-      properties:
-        help_text: Timer duration in seconds (e.g., 60 for 1 minute, 300 for 5 minutes, 3600 for 1 hour).
-        type: number
-      schema_version: 1
-  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.
-  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.