diff --git a/.gitpod.yml b/.gitpod.yml
index a63c07bad2..4c081dd275 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,8 +1,9 @@
 tasks:
   - name: Run Appwrite Docker Stack
     init: |
-      docker compose pull
+      git submodule update --init
       docker compose build
+      docker compose pull
       docker pull composer
     command: |
       docker run --rm --interactive --tty \
diff --git a/Dockerfile b/Dockerfile
index ddc12370c1..7aa447d279 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,12 @@ COPY app/console /usr/local/src/console
 
 WORKDIR /usr/local/src/console
 
+ARG VITE_GA_PROJECT
+ARG VITE_CONSOLE_MODE
+
+ENV VITE_GA_PROJECT=$VITE_GA_PROJECT
+ENV VITE_CONSOLE_MODE=$VITE_CONSOLE_MODE
+
 RUN npm ci
 RUN npm run build
 
diff --git a/app/controllers/general.php b/app/controllers/general.php
index 069a918680..0c10dd46e9 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -223,7 +223,9 @@ App::init()
 
                 return $response->redirect('https://' . $request->getHostname() . $request->getURI());
             }
+        }
 
+        if ($request->getProtocol() === 'https') {
             $response->addHeader('Strict-Transport-Security', 'max-age=' . (60 * 60 * 24 * 126)); // 126 days
         }