diff --git a/.github/workflows/hosting-godot-html5-template-example.yml b/.github/workflows/hosting-godot-html5-template-example.yml
new file mode 100644
index 000000000..e99ce24bc
--- /dev/null
+++ b/.github/workflows/hosting-godot-html5-template-example.yml
@@ -0,0 +1,27 @@
+name: hosting-godot-html5-template
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    paths:
+      - hosting/godot-html5-template/**
+      - .github/workflows/hosting-godot-html5-template-example.yml
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  hosting-godot-html5-template:
+    runs-on: ubuntu-24.04
+    container: ghcr.io/dfinity/icp-dev-env-all:0.3.2
+    env:
+      ICP_CLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+      - name: Deploy
+        working-directory: hosting/godot-html5-template
+        run: |
+          icp network start -d
+          icp deploy
diff --git a/.github/workflows/hosting-photo-storage-example.yml b/.github/workflows/hosting-photo-storage-example.yml
index 7e7719088..293c1968a 100644
--- a/.github/workflows/hosting-photo-storage-example.yml
+++ b/.github/workflows/hosting-photo-storage-example.yml
@@ -1,52 +1,27 @@
 name: hosting-photo-storage
+
 on:
   push:
-    branches:
-      - master
+    branches: [master]
   pull_request:
     paths:
       - hosting/photo-storage/**
-      - .github/workflows/provision-darwin.sh
-      - .github/workflows/provision-linux.sh
       - .github/workflows/hosting-photo-storage-example.yml
-      - .ic-commit
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
+
 jobs:
-  hosting-photo-storage-darwin:
-    runs-on: macos-15
-    steps:
-      - uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
-      - name: Provision Darwin
-        run: bash .github/workflows/provision-darwin.sh
-      - name: Pre-download network launcher
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: bash .github/workflows/pre-download-launcher.sh
-      - name: Hosting Photo Storage Darwin
-        run: |
-          pushd hosting/photo-storage
-          npm install
-          npm run build
-          icp network start -d
-          icp deploy
-          popd
-  hosting-photo-storage-linux:
+  hosting-photo-storage:
     runs-on: ubuntu-24.04
+    container: ghcr.io/dfinity/icp-dev-env-all:0.3.2
+    env:
+      ICP_CLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
-      - name: Provision Linux
-        run: bash .github/workflows/provision-linux.sh
-      - name: Pre-download network launcher
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: bash .github/workflows/pre-download-launcher.sh
-      - name: Hosting Photo Storage Linux
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+      - name: Deploy
+        working-directory: hosting/photo-storage
         run: |
-          pushd hosting/photo-storage
-          npm install
-          npm run build
           icp network start -d
           icp deploy
-          popd
diff --git a/.github/workflows/hosting-static-website-example.yaml b/.github/workflows/hosting-static-website-example.yaml
index f64dbfc65..536003122 100644
--- a/.github/workflows/hosting-static-website-example.yaml
+++ b/.github/workflows/hosting-static-website-example.yaml
@@ -1,48 +1,27 @@
 name: hosting-static-website
+
 on:
   push:
-    branches:
-      - master
+    branches: [master]
   pull_request:
     paths:
       - hosting/static-website/**
-      - .github/workflows/provision-darwin.sh
-      - .github/workflows/provision-linux.sh
       - .github/workflows/hosting-static-website-example.yaml
-      - .ic-commit
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
+
 jobs:
-  hosting-static-website-darwin:
-    runs-on: macos-15
-    steps:
-      - uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
-      - name: Provision Darwin
-        run: bash .github/workflows/provision-darwin.sh
-      - name: Pre-download network launcher
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: bash .github/workflows/pre-download-launcher.sh
-      - name: Hosting Static Website Darwin
-        run: |
-          pushd hosting/static-website
-          icp network start -d
-          icp deploy
-          popd
-  hosting-static-website-linux:
+  hosting-static-website:
     runs-on: ubuntu-24.04
+    container: ghcr.io/dfinity/icp-dev-env-all:0.3.2
+    env:
+      ICP_CLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
-      - name: Provision Linux
-        run: bash .github/workflows/provision-linux.sh
-      - name: Pre-download network launcher
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: bash .github/workflows/pre-download-launcher.sh
-      - name: Hosting Static Website Linux
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+      - name: Deploy
+        working-directory: hosting/static-website
         run: |
-          pushd hosting/static-website
           icp network start -d
           icp deploy
-          popd
diff --git a/.github/workflows/hosting-unity-webgl-example.yaml b/.github/workflows/hosting-unity-webgl-example.yaml
index 96c661691..36792f164 100644
--- a/.github/workflows/hosting-unity-webgl-example.yaml
+++ b/.github/workflows/hosting-unity-webgl-example.yaml
@@ -1,48 +1,27 @@
 name: hosting-unity-webgl
+
 on:
   push:
-    branches:
-      - master
+    branches: [master]
   pull_request:
     paths:
       - hosting/unity-webgl-template/**
-      - .github/workflows/provision-darwin.sh
-      - .github/workflows/provision-linux.sh
       - .github/workflows/hosting-unity-webgl-example.yaml
-      - .ic-commit
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
+
 jobs:
-  hosting-unity-webgl-darwin:
-    runs-on: macos-15
-    steps:
-      - uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
-      - name: Provision Darwin
-        run: bash .github/workflows/provision-darwin.sh
-      - name: Pre-download network launcher
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: bash .github/workflows/pre-download-launcher.sh
-      - name: Hosting Unity Webgl Darwin
-        run: |
-          pushd hosting/unity-webgl-template
-          icp network start -d
-          icp deploy
-          popd
-  hosting-unity-webgl-linux:
+  hosting-unity-webgl:
     runs-on: ubuntu-24.04
+    container: ghcr.io/dfinity/icp-dev-env-all:0.3.2
+    env:
+      ICP_CLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1.2.0
-      - name: Provision Linux
-        run: bash .github/workflows/provision-linux.sh
-      - name: Pre-download network launcher
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: bash .github/workflows/pre-download-launcher.sh
-      - name: Hosting Unity Webgl Linux
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+      - name: Deploy
+        working-directory: hosting/unity-webgl-template
         run: |
-          pushd hosting/unity-webgl-template
           icp network start -d
           icp deploy
-          popd
diff --git a/hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.apple-touch-icon.png b/hosting/godot-html5-template/frontend/assets/ICPluginDemo.apple-touch-icon.png
similarity index 100%
rename from hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.apple-touch-icon.png
rename to hosting/godot-html5-template/frontend/assets/ICPluginDemo.apple-touch-icon.png
diff --git a/hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.audio.worklet.js b/hosting/godot-html5-template/frontend/assets/ICPluginDemo.audio.worklet.js
similarity index 100%
rename from hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.audio.worklet.js
rename to hosting/godot-html5-template/frontend/assets/ICPluginDemo.audio.worklet.js
diff --git a/hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.icon.png b/hosting/godot-html5-template/frontend/assets/ICPluginDemo.icon.png
similarity index 100%
rename from hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.icon.png
rename to hosting/godot-html5-template/frontend/assets/ICPluginDemo.icon.png
diff --git a/hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.js b/hosting/godot-html5-template/frontend/assets/ICPluginDemo.js
similarity index 100%
rename from hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.js
rename to hosting/godot-html5-template/frontend/assets/ICPluginDemo.js
diff --git a/hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.pck b/hosting/godot-html5-template/frontend/assets/ICPluginDemo.pck
similarity index 100%
rename from hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.pck
rename to hosting/godot-html5-template/frontend/assets/ICPluginDemo.pck
diff --git a/hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.png b/hosting/godot-html5-template/frontend/assets/ICPluginDemo.png
similarity index 100%
rename from hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.png
rename to hosting/godot-html5-template/frontend/assets/ICPluginDemo.png
diff --git a/hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.wasm b/hosting/godot-html5-template/frontend/assets/ICPluginDemo.wasm
similarity index 100%
rename from hosting/godot-html5-template/src/godot_html5_assets/assets/ICPluginDemo.wasm
rename to hosting/godot-html5-template/frontend/assets/ICPluginDemo.wasm
diff --git a/hosting/godot-html5-template/src/godot_html5_assets/src/index.html b/hosting/godot-html5-template/frontend/index.html
similarity index 100%
rename from hosting/godot-html5-template/src/godot_html5_assets/src/index.html
rename to hosting/godot-html5-template/frontend/index.html
diff --git a/hosting/godot-html5-template/icp.yaml b/hosting/godot-html5-template/icp.yaml
index 3f825be06..bff85558c 100644
--- a/hosting/godot-html5-template/icp.yaml
+++ b/hosting/godot-html5-template/icp.yaml
@@ -1,10 +1,10 @@
 canisters:
-  - name: godot_html5_assets
+  - name: frontend
     recipe:
-      type: "@dfinity/asset-canister@v2.1.0"
+      type: "@dfinity/asset-canister@v2.2.1"
       configuration:
         dir: dist
         build:
           - mkdir -p dist
-          - cp -r src/godot_html5_assets/assets/* dist/
-          - cp -r src/godot_html5_assets/src/* dist/
+          - cp -r frontend/assets/* dist/
+          - cp frontend/index.html dist/
diff --git a/hosting/photo-storage/icp.yaml b/hosting/photo-storage/icp.yaml
index 535b63ff7..f8dbcb6e8 100644
--- a/hosting/photo-storage/icp.yaml
+++ b/hosting/photo-storage/icp.yaml
@@ -1,7 +1,7 @@
 canisters:
-  - name: photo-storage
+  - name: frontend
     recipe:
-      type: "@dfinity/asset-canister@v2.1.0"
+      type: "@dfinity/asset-canister@v2.2.1"
       configuration:
         dir: dist
         build:
diff --git a/hosting/static-website/icp.yaml b/hosting/static-website/icp.yaml
index c140234cc..0829c7c56 100644
--- a/hosting/static-website/icp.yaml
+++ b/hosting/static-website/icp.yaml
@@ -1,7 +1,7 @@
 canisters:
   - name: frontend
     recipe:
-      type: "@dfinity/asset-canister@v2.1.0"
+      type: "@dfinity/asset-canister@v2.2.1"
       configuration:
         dir: dist
         build:
diff --git a/hosting/unity-webgl-template/src/unity_webgl_template_assets/assets/unity-webgl-build.data b/hosting/unity-webgl-template/frontend/assets/unity-webgl-build.data
similarity index 100%
rename from hosting/unity-webgl-template/src/unity_webgl_template_assets/assets/unity-webgl-build.data
rename to hosting/unity-webgl-template/frontend/assets/unity-webgl-build.data
diff --git a/hosting/unity-webgl-template/src/unity_webgl_template_assets/assets/unity-webgl-build.framework.js b/hosting/unity-webgl-template/frontend/assets/unity-webgl-build.framework.js
similarity index 100%
rename from hosting/unity-webgl-template/src/unity_webgl_template_assets/assets/unity-webgl-build.framework.js
rename to hosting/unity-webgl-template/frontend/assets/unity-webgl-build.framework.js
diff --git a/hosting/unity-webgl-template/src/unity_webgl_template_assets/assets/unity-webgl-build.loader.js b/hosting/unity-webgl-template/frontend/assets/unity-webgl-build.loader.js
similarity index 100%
rename from hosting/unity-webgl-template/src/unity_webgl_template_assets/assets/unity-webgl-build.loader.js
rename to hosting/unity-webgl-template/frontend/assets/unity-webgl-build.loader.js
diff --git a/hosting/unity-webgl-template/src/unity_webgl_template_assets/assets/unity-webgl-build.wasm b/hosting/unity-webgl-template/frontend/assets/unity-webgl-build.wasm
similarity index 100%
rename from hosting/unity-webgl-template/src/unity_webgl_template_assets/assets/unity-webgl-build.wasm
rename to hosting/unity-webgl-template/frontend/assets/unity-webgl-build.wasm
diff --git a/hosting/unity-webgl-template/src/unity_webgl_template_assets/src/index.html b/hosting/unity-webgl-template/frontend/index.html
similarity index 100%
rename from hosting/unity-webgl-template/src/unity_webgl_template_assets/src/index.html
rename to hosting/unity-webgl-template/frontend/index.html
diff --git a/hosting/unity-webgl-template/icp.yaml b/hosting/unity-webgl-template/icp.yaml
index fc16eb9d9..bff85558c 100644
--- a/hosting/unity-webgl-template/icp.yaml
+++ b/hosting/unity-webgl-template/icp.yaml
@@ -1,10 +1,10 @@
 canisters:
-  - name: unity_webgl_template_assets
+  - name: frontend
     recipe:
-      type: "@dfinity/asset-canister@v2.1.0"
+      type: "@dfinity/asset-canister@v2.2.1"
       configuration:
         dir: dist
         build:
           - mkdir -p dist
-          - cp -r src/unity_webgl_template_assets/assets/* dist/
-          - cp -r src/unity_webgl_template_assets/src/* dist/
+          - cp -r frontend/assets/* dist/
+          - cp frontend/index.html dist/