diff --git a/README.md b/README.md
index 54128de4..293d4531 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ A brilliant tool that will pimp your pull requests by collecting and presenting
 - copy `.env-sample` file as `.env` in project root
 - fill the `.env` file
 - install dependencies by `npm install` and run `node ./scripts/init.js`
-  or manually copy all sample files under `libs/pmp-web/core/src/lib/environment/` directory
+  or manually copy all sample files under `libs/pmp-web/core/src/lib/environmentSample/` directory
   without `.sample` key word and fill that files with proper configuration
 
 Generate repository platform client credentials:
diff --git a/apps/pmp-web/src/environments/environment.ts b/apps/pmp-web/src/environments/environment.ts
index 7b4f817a..900acfe5 100644
--- a/apps/pmp-web/src/environments/environment.ts
+++ b/apps/pmp-web/src/environments/environment.ts
@@ -1,5 +1,5 @@
 // This file can be replaced during build by using the `fileReplacements` array.
-// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
+// `ng build --prod` replaces `environment.sample.ts` with `environmentSample.prod.ts`.
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {
diff --git a/libs/pmp-web/shared/config/src/index.ts b/libs/pmp-web/shared/config/src/index.ts
index 6551c870..729b8440 100644
--- a/libs/pmp-web/shared/config/src/index.ts
+++ b/libs/pmp-web/shared/config/src/index.ts
@@ -1,3 +1,3 @@
 export * from './lib/configs/bitbucket-auth.config';
 export * from './lib/configs/github-auth.config';
-export * from './lib/environment/environment';
+export * from './lib/environment/environment.sample';
diff --git a/libs/pmp-web/shared/config/src/lib/environment/.gitignore b/libs/pmp-web/shared/config/src/lib/environment/.gitignore
index 541ef130..c1a411e9 100644
--- a/libs/pmp-web/shared/config/src/lib/environment/.gitignore
+++ b/libs/pmp-web/shared/config/src/lib/environment/.gitignore
@@ -1,2 +1,2 @@
-environment.ts
+environment.sample.ts
 environment.prod.ts
diff --git a/nx.json b/nx.json
index 3dc0c992..44a5a9e8 100644
--- a/nx.json
+++ b/nx.json
@@ -185,6 +185,9 @@
     "pmp-web-shared-util-ngrx": {
       "tags": ["platform:web", "scope:shared", "type:util"]
     },
+    "server-user-api-rest": {
+      "tags": ["platform:server", "scope:user", "type:api"]
+    },
     "server-shared-util-bitbucket": {
       "tags": ["platform:server", "scope:shared", "type:util"]
     },
@@ -199,6 +202,9 @@
     },
     "pmp-web-shared-core": {
       "tags": ["platform:web", "type:core"]
+    },
+    "pmp-web-shared-ui-generic-dialog": {
+      "tags": ["platform:web", "scope:shared", "type:ui"]
     }
   }
 }