diff --git a/.env.hadith b/.env.hadith
index 7e3da48..d1eb86e 100644
--- a/.env.hadith
+++ b/.env.hadith
@@ -1,5 +1,4 @@
-VITE_API_NAME=api/
-VITE_BASE_URL=http://192.168.23.60/
+NUXT_PUBLIC_BASE_URL=http://192.168.23.60/
 
 VITE_APP_NAME=Hadith
 
diff --git a/.env.majles b/.env.majles
index ab79b62..edb57ef 100644
--- a/.env.majles
+++ b/.env.majles
@@ -1,4 +1,4 @@
-VITE_APP_NAME=Majles
+NUXT_PUBLIC_BASE_URL=Majles
 
 
 ### Relative pathes for systems sass addressing ###
diff --git a/.env.monir b/.env.monir
index 9da983c..3f76055 100644
--- a/.env.monir
+++ b/.env.monir
@@ -1,5 +1,4 @@
-VITE_API_NAME=api/
-VITE_BASE_URL=http://192.168.23.60/
+NUXT_PUBLIC_BASE_URL=http://192.168.23.60/
 
 VITE_APP_NAME=Monir
 
diff --git a/.env.tavasi b/.env.tavasi
index 2b9fea7..011e3c9 100644
--- a/.env.tavasi
+++ b/.env.tavasi
@@ -1,7 +1,6 @@
 
-VITE_API_NAME=api/
 
-VITE_BASE_URL=http://192.168.23.160/
+NUXT_PUBLIC_BASE_URL=http://192.168.23.160/
 
 VITE_APP_NAME=Majles
 
diff --git a/systems/hadith_ui b/systems/hadith_ui
index 88721db..2cff09d 160000
--- a/systems/hadith_ui
+++ b/systems/hadith_ui
@@ -1 +1 @@
-Subproject commit 88721dbb1a9c9de9f0d37f3d9b305bfb5e360d40
+Subproject commit 2cff09d0a0a687792e636d473a9bbeffc431671d