diff --git a/.gitignore b/.gitignore
index 5bc2bc2..0c32b4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,4 +144,5 @@ dist
 .pnp.*
 
 #screenshots
-tests/cypress/screenshots
\ No newline at end of file
+tests/cypress/screenshots
+services/cmd-hook/cmd-hook
diff --git a/app/src/components/game/ControlPalette.vue b/app/src/components/game/ControlPalette.vue
index 8d82084..f5dd047 100644
--- a/app/src/components/game/ControlPalette.vue
+++ b/app/src/components/game/ControlPalette.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useRouter } from 'vue-router'
 import { useToast } from 'vue-toastification'
-import useSession from '../../store/session'
+import { useSession } from '../../store/session'
 import { openBugReport, openQuestSurvey } from '../../utils/formbricks'
 
 const router = useRouter()
diff --git a/app/src/components/game/DescriptionPart.vue b/app/src/components/game/DescriptionPart.vue
index e1d85b9..5ebd797 100644
--- a/app/src/components/game/DescriptionPart.vue
+++ b/app/src/components/game/DescriptionPart.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue'
-import useSession from '../../store/session'
+import { useSession } from '../../store/session'
 import MarkdownText from '../MarkdownText.vue'
 
 const sessionStore = useSession()
diff --git a/app/src/components/game/QuestPart.vue b/app/src/components/game/QuestPart.vue
index 7ef9630..7ecffbe 100644
--- a/app/src/components/game/QuestPart.vue
+++ b/app/src/components/game/QuestPart.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import MarkdownText from '../MarkdownText.vue'
-import useSession from '../../store/session'
+import { useSession } from '../../store/session'
 
 const sessionStore = useSession()
 const tasks = computed(() => {
@@ -22,11 +22,6 @@ const tasks = computed(() => {
   <div class="h-full w-full max-h-full">
     <p id="topic" class="text-text font-black" v-if="sessionStore.quest">
       {{ sessionStore.quest.title }}
-      <a
-        :href="`http://localhost/terminal/${sessionStore.session?.containerName}?token=${sessionStore.session?.token}`"
-      >
-        Open Terminal
-      </a>
     </p>
     <br />
     <div>
diff --git a/app/src/components/game/StartButton.vue b/app/src/components/game/StartButton.vue
index e6aa077..0eae4bc 100644
--- a/app/src/components/game/StartButton.vue
+++ b/app/src/components/game/StartButton.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useToast } from 'vue-toastification'
 import { computed } from 'vue'
-import useSession from '../../store/session'
+import { useSession } from '../../store/session'
 
 const toast = useToast()
 const sessionStore = useSession()
diff --git a/app/src/components/game/TerminalPart.vue b/app/src/components/game/TerminalPart.vue
index 000b60e..9436daf 100644
--- a/app/src/components/game/TerminalPart.vue
+++ b/app/src/components/game/TerminalPart.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import { onMounted, onUnmounted, ref } from 'vue'
-import { useTerminal } from '../../store/session'
+import { useSession, useTerminal } from '../../store/session'
+
+const sessionStore = useSession()
 
 const terminal = ref<HTMLElement | null>(null)
 const term = useTerminal()
@@ -23,6 +25,14 @@ onMounted(() => {
     <div class="flex items-center gap-2 p-1">
       <font-awesome-icon :icon="['fas', 'terminal']" class="text-text" />
       <button id="Terminal" class="text-text">終端機</button>
+
+      <a
+        class="text-sm font-normal text-gray-200 ml-10"
+        :href="`/terminal/${sessionStore.session?.containerName}?token=${sessionStore.session?.token}`"
+        target="_blank"
+      >
+        Open Terminal in New Tab
+      </a>
     </div>
     <div
       id="terminal"
diff --git a/app/src/components/game/TreeChart.vue b/app/src/components/game/TreeChart.vue
index 687cbd1..0d3f429 100644
--- a/app/src/components/game/TreeChart.vue
+++ b/app/src/components/game/TreeChart.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import FileNode from '../FileNode.vue'
-import useSession from '../../store/session'
+import { useSession } from '../../store/session'
 
 const sessionStore = useSession()
 </script>
diff --git a/app/src/components/header/GameHeaderComponents.vue b/app/src/components/header/GameHeaderComponents.vue
index 1987895..38a8006 100644
--- a/app/src/components/header/GameHeaderComponents.vue
+++ b/app/src/components/header/GameHeaderComponents.vue
@@ -5,7 +5,7 @@ import { useToast } from 'vue-toastification'
 import { logout } from '../../utils/auth'
 import { trpc } from '../../utils/trpc'
 import { openBugReport } from '../../utils/formbricks'
-import useSession from '../../store/session'
+import { useSession } from '../../store/session'
 import useUserProfile from '../../store/userProfile'
 
 const userStore = useUserProfile()
diff --git a/app/src/store/session.ts b/app/src/store/session.ts
index 9a8e35c..87e3f2d 100644
--- a/app/src/store/session.ts
+++ b/app/src/store/session.ts
@@ -34,7 +34,7 @@ interface Store {
   quest: QuestDetailResponse | null
 }
 
-const useSession = defineStore('session', {
+export const useSession = defineStore('session', {
   state: (): Store => ({
     session: null,
     questId: '',
@@ -126,5 +126,3 @@ const useSession = defineStore('session', {
 export function useTerminal() {
   return term
 }
-
-export default useSession
diff --git a/app/src/utils/formbricks.ts b/app/src/utils/formbricks.ts
index 761a489..b7f4caa 100644
--- a/app/src/utils/formbricks.ts
+++ b/app/src/utils/formbricks.ts
@@ -1,5 +1,5 @@
 import formbricks from '@formbricks/js/website'
-import useSession from '../store/session'
+import { useSession } from '../store/session'
 import useUserProfile from '../store/userProfile'
 
 if (typeof window !== 'undefined') {
diff --git a/app/src/views/GamePage.vue b/app/src/views/GamePage.vue
index ad7cc2b..f281126 100644
--- a/app/src/views/GamePage.vue
+++ b/app/src/views/GamePage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, onMounted, watch } from 'vue'
-import useSession from '../store/session'
+import { useSession } from '../store/session'
 import useUserProfile from '../store/userProfile'
 import HeaderPart from '../components/header/HeaderPart.vue'
 import GameHeaderComponents from '../components/header/GameHeaderComponents.vue'
diff --git a/server/src/models/sessionManager.ts b/server/src/models/sessionManager.ts
index 6b312ed..22497fd 100644
--- a/server/src/models/sessionManager.ts
+++ b/server/src/models/sessionManager.ts
@@ -8,6 +8,7 @@ import {
 } from '../containers/docker.js'
 import logger from '../utils/logger.js'
 import { questManager } from './quest.js'
+import config from '../config'
 
 async function deactivateSessions(userId: string, quest: string) {
   const sessions = await Session.find({
@@ -65,7 +66,7 @@ export async function createNewSession(
   })
 
   console.log('container', container.id)
-  console.log('containerName', `http://localhost/terminal/${containerName}`)
+  console.log('containerName', `${config.baseUrl}/terminal/${containerName}`)
 
   const progress = userProfile.progress.get(quest.id)
   if (!progress) {