diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7c4aa5ad..12618af4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     env:
       BLOCKCORE: "blockcore"
       COINVAULT: "coinvault"
-      SMARTCITYPLATFORM: "smartcityplatform"
+      FREECITY: "freecity"
 
     steps:
       - name: Checkout
@@ -68,9 +68,9 @@ jobs:
 
       - name: Package FreeCityWallet
         run: |
-          npm run build:smartcityplatform
+          npm run build:freecity
           cd dist/extension
-          zip -r ../../${{env.RELEASE_NAME_SMARTCITYPLATFORM}} "./"
+          zip -r ../../${{env.RELEASE_NAME_FREECITY}} "./"
           cd ../../
           rm -rf  dist/extension
 
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index a23b17b8..84e8a777 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -15,7 +15,7 @@ jobs:
     env:
       BLOCKCORE: "blockcore"
       COINVAULT: "coinvault"
-      SMARTCITYPLATFORM: "smartcityplatform"
+      FREECITY: "freecity"
 
     steps:
       - name: Checkout
diff --git a/README.md b/README.md
index 9567ecac..56299359 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ This wallet is made available in multiple different instances that has different
 
 - Chains: City Chain
 - Features: Focused on decentralized citizenship
-- Download: ["smartcityplatform-\*.zip](https://github.com/block-core/blockcore-wallet/releases)
+- Download: ["freecity-\*.zip](https://github.com/block-core/blockcore-wallet/releases)
 
 ## Supported Browsers
 
diff --git a/angular.json b/angular.json
index 04946d4f..795abb44 100644
--- a/angular.json
+++ b/angular.json
@@ -193,10 +193,10 @@
                 }
               ]
             },
-            "smartcityplatform": {
+            "freecity": {
               "stylePreprocessorOptions": {
                 "includePaths": [
-                  "angular/src/styles/smartcityplatform/"
+                  "angular/src/styles/freecity/"
                 ]
               },
               "buildOptimizer": false,
@@ -228,7 +228,7 @@
               ],
               "assets": [
                 {
-                  "input": "angular/src/assets/smartcityplatform/",
+                  "input": "angular/src/assets/freecity/",
                   "output": "/assets",
                   "glob": "*"
                 },
@@ -238,7 +238,7 @@
                   "glob": "*"
                 },
                 {
-                  "input": "angular/src/manifest/smartcityplatform/",
+                  "input": "angular/src/manifest/freecity/",
                   "output": "/",
                   "glob": "*"
                 }
@@ -246,7 +246,7 @@
               "fileReplacements": [
                 {
                   "replace": "angular/src/environments/environment.ts",
-                  "with": "angular/src/environments/environment.smartcityplatform.ts"
+                  "with": "angular/src/environments/environment.freecity.ts"
                 }
               ]
             }
@@ -268,8 +268,8 @@
             "coinvault": {
               "browserTarget": "blockcore-wallet:build:coinvault"
             },
-            "smartcityplatform": {
-              "browserTarget": "blockcore-wallet:build:smartcityplatform"
+            "freecity": {
+              "browserTarget": "blockcore-wallet:build:freecity"
             }
           },
           "defaultConfiguration": "development"
diff --git a/angular/src/environments/environment.smartcityplatform.ts b/angular/src/environments/environment.smartcityplatform.ts
index bdec9c37..da4cb9fb 100644
--- a/angular/src/environments/environment.smartcityplatform.ts
+++ b/angular/src/environments/environment.smartcityplatform.ts
@@ -12,12 +12,12 @@ export const environment: IEnvironment = {
   production: true,
   enableDebugTools: false,
   logLevel: 'info',
-  features: ['wallet', 'identity', 'handler:pay', 'handler:did'],
-  releaseUrl: 'https://github.com/CityChainFoundation/free-city-wallet/releases',
-  sourceUrl: 'https://github.com/CityChainFoundation/free-city-wallet',
-  instance: 'smartcityplatform',
+  features: ['wallet', 'identity', 'handler:pay', 'handler:did', 'handler:nostr'],
+  releaseUrl: 'https://github.com/block-core/blockcore-wallet/releases',
+  sourceUrl: 'https://github.com/block-core/blockcore-wallet',
+  instance: 'freecity',
   instanceName: 'Free City Wallet',
-  instanceUrl: 'https://www.city-chain.org/',
-  instanceExplorerUrl: 'https://explorer.city-chain.org',
-  networks: ['CITY', 'IDENTITY']
+  instanceUrl: 'https://www.freeplatform.city/',
+  instanceExplorerUrl: 'https://explorer.blockcore.net',
+  networks: ['CITY', 'IDENTITY', 'NOSTR', 'JWK', 'KEY', 'BTC']
 };
diff --git a/angular/src/environments/environments.ts b/angular/src/environments/environments.ts
index fc8399e2..c24cdb25 100644
--- a/angular/src/environments/environments.ts
+++ b/angular/src/environments/environments.ts
@@ -1,5 +1,5 @@
 export enum Environments {
     Blockcore = 'blockcore',
     CoinVault = 'coinvault',
-    SmartCityPlatform = 'smartcityplatform'
+    FreeCity = 'freecity'
 }
diff --git a/angular/src/manifest/smartcityplatform/manifest.webmanifest b/angular/src/manifest/smartcityplatform/manifest.webmanifest
index 896fa7d4..cc0becce 100644
--- a/angular/src/manifest/smartcityplatform/manifest.webmanifest
+++ b/angular/src/manifest/smartcityplatform/manifest.webmanifest
@@ -66,7 +66,6 @@
         "Coins",
         "Tokens",
         "Identities",
-        "SmartCityPlatform",
         "FreeCity",
         "FreeCityWallet",
         "FreeCityPlatform",
diff --git a/angular/src/shared/defaults.ts b/angular/src/shared/defaults.ts
index 08f66a46..585aeb01 100644
--- a/angular/src/shared/defaults.ts
+++ b/angular/src/shared/defaults.ts
@@ -286,7 +286,7 @@ export class Defaults {
           },
         ];
         break;
-      case 'smartcityplatform':
+      case 'freecity':
         accounts = [
           {
             identifier: uuidv4(),
diff --git a/package.json b/package.json
index e6449eb4..7a005a7f 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "version": "node -p \"require('./package.json').version\"",
     "changelog": "conventional-changelog -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md",
-    "all": "npm run build:production && npm run build:coinvault && npm run build:smartcityplatform",
+    "all": "npm run build:production && npm run build:coinvault && npm run build:freecity",
     "ng": "ng",
     "start": "npm run watch",
     "web": "npm-run-all --parallel watch serve:web",
@@ -15,7 +15,7 @@
     "build:angular": "ng build --configuration development",
     "build:angular-production": "ng build --configuration production",
     "build:angular-coinvault": "ng build --configuration coinvault",
-    "build:angular-smartcityplatform": "ng build --configuration smartcityplatform",
+    "build:angular-freecity": "ng build --configuration freecity",
     "watch:angular": "ng build --watch --configuration development --delete-output-path false --source-map=true",
     "build:extension": "webpack --config extension/webpack.config.js",
     "build:extension-production": "webpack --config extension/webpack.config.prod.js",
@@ -23,7 +23,7 @@
     "build": "npm run clean && npm run build:angular && npm run build:extension",
     "build:production": "npm run build:angular-production && npm run build:extension-production",
     "build:coinvault": "npm run build:angular-coinvault && npm run build:extension-production",
-    "build:smartcityplatform": "npm run build:angular-smartcityplatform && npm run build:extension-production",
+    "build:freecity": "npm run build:angular-freecity && npm run build:extension-production",
     "watch": "npm run clean && npm-run-all --parallel watch:*",
     "clean": "rimraf dist/extension",
     "pack:production": "npm run build:angular-production && npm run build:extension-production && npm run pack",