diff --git a/env.js b/env.js
index 97c464e..d8816b1 100644
--- a/env.js
+++ b/env.js
@@ -14,14 +14,12 @@ export const PRODUCTION_REGISTRY_URL = 'https://blocks-registery.axe-web.com';
 export const IS_DEV = process.env.NODE_ENV === 'development';
 export const BLOCK_NAME = process.env.BLOCK_NAME;
 export const MODULE_PATH = getModulePath();
-export const PROJECT_PATH = getProjectPath();
-
 
 /**
  * Overwrite env variables.
  */
 
-process.env.NODE_CONFIG_DIR = path.join(PROJECT_PATH, 'config');
+process.env.NODE_CONFIG_DIR = path.join(getProjectPath(), 'config');
 
 
 /**
@@ -41,13 +39,13 @@ function getModulePath() {
   return modulePath;
 }
 
-function getProjectPath() {
+export function getProjectPath() {
   let projectPath = '';
 
   if (typeof process.env.PROJECT_PATH !== 'undefined') {
-    projectPath = path.join(process.env.PROJECT_PATH, BLOCK_NAME)
-  } else if (BLOCK_NAME) {
-    projectPath = path.join('blocks', BLOCK_NAME)
+    projectPath = path.join(process.env.PROJECT_PATH ?? '', process.env.BLOCK_NAME ?? '')
+  } else if (process.env.BLOCK_NAME) {
+    projectPath = path.join('blocks', process.env.BLOCK_NAME ?? '')
   }
 
   return projectPath;
diff --git a/helpers.js b/helpers.js
index 00146ac..343c514 100644
--- a/helpers.js
+++ b/helpers.js
@@ -1,5 +1,5 @@
 import path from 'path';
-import {BLOCK_NAME, IS_DEV, MODULE_PATH, PROJECT_PATH} from "./env.js";
+import {BLOCK_NAME, getProjectPath, IS_DEV, MODULE_PATH} from "./env.js";
 import config from 'config';
 import {fileURLToPath} from 'url';
 import memFs from 'mem-fs';
@@ -18,7 +18,7 @@ export function getConfigs() {
     isDev: IS_DEV,
     developmentBlockName: BLOCK_NAME,
     modulesPath: MODULE_PATH,
-    projectPath: PROJECT_PATH,
+    projectPath: getProjectPath(),
   };
 }