diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js
index eea2df5..6fa3f71 100644
--- a/src-pwa/custom-service-worker.js
+++ b/src-pwa/custom-service-worker.js
@@ -16,7 +16,7 @@ importScripts('../statics/js/workbox-sw.js');
 
 
 let port = 3000;
-if (self.location.hostname === 'test.freeplanet.app') {
+if (self.location.hostname.startsWith('test')) {
   port = 3001;
 }
 // console.log('SW-06 1');
@@ -68,7 +68,7 @@ if (workbox) {
   const debug = false;
   workbox.setConfig({ debug: debug });
 
-  workbox.core.setCacheNameDetails({ prefix: "freeplanet" });
+  workbox.core.setCacheNameDetails({ prefix: self.location.hostname });
 
   /**
    * The workboxSW.precacheAndRoute() method efficiently caches and responds to
@@ -281,7 +281,7 @@ if (workbox) {
 
 // Storage
   workbox.routing.registerRoute(
-    new RegExp(/.*(?:storage\.freeplanet)\.app.*$/),
+    new RegExp(/.*(?:storage.*$/),
     workbox.strategies.staleWhileRevalidate({
       cacheName: 'storage',
       plugins: [
diff --git a/src/components/logo/logo.ts b/src/components/logo/logo.ts
index 3ffed69..d76e49d 100644
--- a/src/components/logo/logo.ts
+++ b/src/components/logo/logo.ts
@@ -9,4 +9,8 @@ export default class Logo extends Vue {
   get logoimg() {
     return '../../' + tools.getimglogo()
   }
+
+  get logoalt() {
+    return process.env.APP_NAME
+  }
 }
diff --git a/src/components/logo/logo.vue b/src/components/logo/logo.vue
index 65c27c7..aaa2400 100644
--- a/src/components/logo/logo.vue
+++ b/src/components/logo/logo.vue
@@ -1,6 +1,6 @@
 <template>
     <div id="logo">
-        <img id="logoimg" alt="FreePlanet" :src=logoimg>
+        <img id="logoimg" :alt="logoalt" :src=logoimg>
     </div>
 </template>
 <script lang="ts" src="./logo.ts">
diff --git a/src/root/home/home.ts b/src/root/home/home.ts
index 88a03f4..97ba0d7 100644
--- a/src/root/home/home.ts
+++ b/src/root/home/home.ts
@@ -208,7 +208,7 @@ export default class Home extends Vue {
       options = {
         body: mythis.$t('notification.subscribed'),
         icon: '/statics/icons/android-chrome-192x192.png',
-        image: '/statics/images/freeplanet.png',
+        image: '/statics/images/imglogonotif.png',
         dir: 'ltr',
         lang: 'enUs', // BCP 47,
         vibrate: [100, 50, 200],
diff --git a/src/root/home/home.vue b/src/root/home/home.vue
index a09d4c3..8934129 100644
--- a/src/root/home/home.vue
+++ b/src/root/home/home.vue
@@ -23,7 +23,7 @@
                                 </div>
                                 <div class="flex justify-end">
                                     <div class="q-gutter-xs testo-banda clgutter">
-                                        <div class="text-h1 shadow-max">{{appname}}</div>
+                                        <div class="text-h1 shadow-max">{{$t('msg.myAppName')}}</div>
                                         <div class="text-subtitle1 shadow text-italic q-pl-sm">
                                             {{$t('msg.sottoTitoloApp')}}
                                         </div>
@@ -110,7 +110,7 @@
                                 </div>
                                 <div class="flex justify-end">
                                     <div class="q-gutter-xs testo-banda clgutter">
-                                        <div class="text-h1 shadow-max">FreePlanet</div>
+                                        <div class="text-h1 shadow-max">{{$t('msg.myAppName')}}</div>
                                         <div class="text-subtitle1 shadow text-italic q-pl-sm">
                                             {{$t('msg.sottoTitoloApp')}}
                                         </div>
@@ -201,7 +201,7 @@
                                 </div>
                                 <div class="flex justify-end">
                                     <div class="q-gutter-xs testo-banda clgutter">
-                                        <div class="text-h1 shadow-max">FreePlanet</div>
+                                        <div class="text-h1 shadow-max">{{getenv('APP_NAME')}}</div>
                                         <div class="text-subtitle1 shadow text-italic q-pl-sm">
                                             {{$t('msg.sottoTitoloApp')}}
                                         </div>
diff --git a/src/statics/images/freeplanet.png b/src/statics/images/freeplanet.png
deleted file mode 100644
index b5e10db..0000000
Binary files a/src/statics/images/freeplanet.png and /dev/null differ