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 7ec2285..219c2a6 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 Clock 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/.gitignore b/.gitignore
index 8cca084..47af923 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ mock-data.yml
 static/js/*.js
 static/js/*.js.map
 screenshots/*.png
+.env
diff --git a/screenly.yml b/screenly.yml
index 1af27d9..7e9cab8 100644
--- a/screenly.yml
+++ b/screenly.yml
@@ -1,6 +1,5 @@
 ---
 syntax: manifest_v1
-id: 01HKT2K8GVE8P6RE36QFKPG5G1
 description: Screenly Clock Edge App
 icon: https://playground.srly.io/edge-apps/icons/clock.svg
 author: Screenly, Inc.
diff --git a/screenly_qc.yml b/screenly_qc.yml
deleted file mode 100644
index 00a6039..0000000
--- a/screenly_qc.yml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-syntax: manifest_v1
-id: 01JZHR7YXWK81TNPY9F9JKQ5H4
-description: Screenly Clock Edge App
-icon: https://playground.srly.io/edge-apps/icons/clock.svg
-author: Screenly, Inc.
-categories:
-  - Utilities
-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
-  openweathermap_api_key:
-    type: secret
-    title: OpenWeatherMap API Key
-    optional: true
-    help_text:
-      properties:
-        help_text: |
-          Enter your OpenWeatherMap API key to access weather data. If not provided, weather information will not be displayed.
-          You can get your API key from https://openweathermap.org/api.
-        type: string
-      schema_version: 1
-    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/
-  style:
-    type: string
-    default_value: traditional
-    title: Style
-    optional: true
-    help_text:
-      properties:
-        help_text: Select the visual style for the clock.
-        options:
-        - label: Traditional
-          value: traditional
-        - label: Modern
-          value: modern
-        - label: Minimal
-          value: minimal
-        type: select
-      schema_version: 1
-  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
-  unit:
-    type: string
-    default_value: auto
-    title: Measurement Unit
-    optional: true
-    help_text:
-      properties:
-        advanced: true
-        help_text: Select the measurement unit for temperature display.
-        options:
-        - label: Auto (based on location)
-          value: auto
-        - label: Metric (°C)
-          value: metric
-        - label: Imperial (°F)
-          value: imperial
-        type: select
-      schema_version: 1