diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f49673c801..451b942ea7 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -49,9 +49,10 @@ jobs:
         env:
           NEXT_PUBLIC_API_GATEWAY_URL: ${{ secrets.NEXT_PUBLIC_API_GATEWAY_URL }}
           NEXT_PUBLIC_GITHUB_CLIENT_ID: ${{ secrets.NEXT_PUBLIC_GITHUB_CLIENT_ID }}
+          NEXT_PUBLIC_SOCK_SERVER_URL: ${{ secrets.NEXT_PUBLIC_SOCK_SERVER_URL }}
         run: |
           gcloud builds submit --config cloudbuilds/fe.yaml \
-            --substitutions _NEXT_PUBLIC_API_GATEWAY_URL="$NEXT_PUBLIC_API_GATEWAY_URL",_NEXT_PUBLIC_GITHUB_CLIENT_ID="$NEXT_PUBLIC_GITHUB_CLIENT_ID"
+            --substitutions _NEXT_PUBLIC_API_GATEWAY_URL="$NEXT_PUBLIC_API_GATEWAY_URL",_NEXT_PUBLIC_GITHUB_CLIENT_ID="$NEXT_PUBLIC_GITHUB_CLIENT_ID",_NEXT_PUBLIC_SOCK_SERVER_URL="$NEXT_PUBLIC_SOCK_SERVER_URL"
 
   deploy-api-gateway:
     needs: check-changes
diff --git a/peerprep-fe/Dockerfile b/peerprep-fe/Dockerfile
index fb1ee198df..7628ebcf7d 100644
--- a/peerprep-fe/Dockerfile
+++ b/peerprep-fe/Dockerfile
@@ -32,10 +32,12 @@ ENV PORT=3000
 # Accept build argument
 ARG NEXT_PUBLIC_API_GATEWAY_URL
 ARG NEXT_PUBLIC_GITHUB_CLIENT_ID
+ARG NEXT_PUBLIC_SOCK_SERVER_URL
 
 # Set environment variable
 ENV NEXT_PUBLIC_API_GATEWAY_URL=$NEXT_PUBLIC_API_GATEWAY_URL
 ENV NEXT_PUBLIC_GITHUB_CLIENT_ID=$NEXT_PUBLIC_GITHUB_CLIENT_ID
+ENV NEXT_PUBLIC_SOCK_SERVER_URL=$NEXT_PUBLIC_SOCK_SERVER_URL
 
 COPY . .
 RUN pnpm build
diff --git a/peerprep-fe/src/app/collaboration/components/CollaborationEditor.tsx b/peerprep-fe/src/app/collaboration/components/CollaborationEditor.tsx
index a3d9e08660..30c78f3e57 100644
--- a/peerprep-fe/src/app/collaboration/components/CollaborationEditor.tsx
+++ b/peerprep-fe/src/app/collaboration/components/CollaborationEditor.tsx
@@ -83,7 +83,7 @@ const CollaborationEditor = ({
       const states = providerRef.current?.awareness.getStates();
       if (states) {
         const newClients = new Map<number, ConnectedClient>();
-        // Build new clients map
+        // Build new clients map.
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         states.forEach((value: { [x: string]: any }) => {
           const state = value as AwarenessState;