diff --git a/.github/workflows/docker-react-deploy.yml b/.github/workflows/docker-react-deploy.yml
index 66f1899..d5c2fa5 100644
--- a/.github/workflows/docker-react-deploy.yml
+++ b/.github/workflows/docker-react-deploy.yml
@@ -25,8 +25,14 @@ jobs:
 
             - name: Build the Docker image
               run: |
-                  docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/todo-client:${{ env.DATE_TAG }} client
-
+                  docker build \
+                  --build-arg VITE_SERVER_URL=${{ secrets.VITE_SERVER_URL }} \
+                  --build-arg VITE_SERVER_LOGIN_PATH=Auth/login \
+                  --build-arg VITE_SERVER_REGISTER_PATH=Auth/register \
+                  --build-arg VITE_SERVER_REFRESH_PATH=Auth/refresh \
+                  --build-arg VITE_SERVER_LOGOUT_PATH=Auth/logout \
+                  -t ${{ secrets.DOCKERHUB_USERNAME }}/todo-client:${{ env.DATE_TAG }} client
+                  
             - name: Tag the Docker image
               run: |
                   # Tag with timestamp
diff --git a/.github/workflows/dotnet-lint.yml b/.github/workflows/dotnet-lint.yml
index a72fc23..b324bb6 100644
--- a/.github/workflows/dotnet-lint.yml
+++ b/.github/workflows/dotnet-lint.yml
@@ -2,7 +2,7 @@ name: ASP.NET Linting
 
 on:
     push:
-        branches: "**"
+        branches-ignore: ["main"]
         paths:
             - "server/**"
     pull_request:
diff --git a/.github/workflows/typescript-lint.yml b/.github/workflows/typescript-lint.yml
index e153d90..03d1206 100644
--- a/.github/workflows/typescript-lint.yml
+++ b/.github/workflows/typescript-lint.yml
@@ -2,7 +2,7 @@ name: React TypeScript Linting
 
 on:
     push:
-        branches: "**"
+        branches-ignore: ["main"]
         paths:
             - "client/**"
     pull_request:
diff --git a/client/Dockerfile b/client/Dockerfile
index ef9372d..94e0765 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -5,6 +5,21 @@ WORKDIR /Todo
 # Build stage for compiling and publishing the application
 FROM base AS build
 WORKDIR /Todo/src
+
+# Add build arguments
+ARG VITE_SERVER_URL
+ARG VITE_SERVER_LOGIN_PATH
+ARG VITE_SERVER_REGISTER_PATH
+ARG VITE_SERVER_REFRESH_PATH
+ARG VITE_SERVER_LOGOUT_PATH
+
+# Set environment variables
+ENV VITE_SERVER_URL=$VITE_SERVER_URL
+ENV VITE_SERVER_LOGIN_PATH=$VITE_SERVER_LOGIN_PATH
+ENV VITE_SERVER_REGISTER_PATH=$VITE_SERVER_REGISTER_PATH
+ENV VITE_SERVER_REFRESH_PATH=$VITE_SERVER_REFRESH_PATH
+ENV VITE_SERVER_LOGOUT_PATH=$VITE_SERVER_LOGOUT_PATH
+
 COPY package*.json .
 RUN npm install
 COPY . .