diff --git a/.gitmodules b/.gitmodules
index bb712443a0..ad823b3d9b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
- [submodule "console"]
-     path = app/console
-     url = https://github.com/appwrite/console.git
-     branch = main
\ No newline at end of file
+[submodule "app/console"]
+	path = app/console
+	url = https://github.com/appwrite/console.git
+    branch = main
diff --git a/Dockerfile b/Dockerfile
index 83e7980dc3..273f184405 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,13 +14,9 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
 
 FROM node:16.14.2-alpine3.15 as node
 
-WORKDIR /usr/local/src/
+COPY app/console /usr/local/src/console
 
-COPY package-lock.json /usr/local/src/
-COPY package.json /usr/local/src/
-COPY gulpfile.js /usr/local/src/
-COPY public /usr/local/src/public
-COPY console /usr/local/src/console
+WORKDIR /usr/local/src/console/
 
 RUN npm ci
 RUN npm run build
@@ -298,7 +294,7 @@ RUN \
 WORKDIR /usr/src/code
 
 COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor
-COPY --from=node /usr/local/src/public/dist /usr/src/code/public/dist
+COPY --from=node /usr/local/src/console/build /usr/src/code/console
 COPY --from=swoole /usr/local/lib/php/extensions/no-debug-non-zts-20200930/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/yasd.so* /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
 COPY --from=redis /usr/local/lib/php/extensions/no-debug-non-zts-20200930/redis.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
 COPY --from=imagick /usr/local/lib/php/extensions/no-debug-non-zts-20200930/imagick.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
@@ -314,7 +310,6 @@ COPY ./bin /usr/local/bin
 COPY ./docs /usr/src/code/docs
 COPY ./public/fonts /usr/src/code/public/fonts
 COPY ./public/images /usr/src/code/public/images
-COPY ./console /usr/src/code/console
 COPY ./src /usr/src/code/src
 
 # Set Volumes
diff --git a/app/console b/app/console
new file mode 160000
index 0000000000..1a65be11d1
--- /dev/null
+++ b/app/console
@@ -0,0 +1 @@
+Subproject commit 1a65be11d12fddb0f887bceb3b25044f6e81f5bd
diff --git a/app/controllers/web/console.php b/app/controllers/web/console.php
index 8001a58d01..fa4f76a9d0 100644
--- a/app/controllers/web/console.php
+++ b/app/controllers/web/console.php
@@ -3,8 +3,8 @@
 use Appwrite\Utopia\Response;
 use Utopia\App;
 
-App::get('/')
-    ->alias('/console/*')
+App::get('/console/*')
+    ->alias('/')
     ->alias('/invite')
     ->alias('/login')
     ->alias('/recover')