diff --git a/.github/workflows/release-docker-github.yml b/.github/workflows/release-docker-github.yml
index d45a3ec7d8..d3ab74097b 100644
--- a/.github/workflows/release-docker-github.yml
+++ b/.github/workflows/release-docker-github.yml
@@ -75,6 +75,10 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          build-args: |
+            NEXTAUTH_SECRET=${{ env.NEXTAUTH_SECRET }}
+            DATABASE_URL=${{ env.DATABASE_URL }}
+            ENCRYPTION_KEY=${{ env.ENCRYPTION_KEY }}
 
       # Sign the resulting Docker image digest except on PRs.
       # This will only write to the public Rekor transparency log when the Docker
diff --git a/packages/js/src/lib/initialize.ts b/packages/js/src/lib/initialize.ts
index fc57399ee9..bc3ad40e32 100644
--- a/packages/js/src/lib/initialize.ts
+++ b/packages/js/src/lib/initialize.ts
@@ -14,7 +14,7 @@ import { addCleanupEventListeners, addEventListeners, removeAllEventListeners }
 import { Logger } from "./logger";
 import { checkPageUrl } from "./noCodeActions";
 import { sync } from "./sync";
-import { addWidgetContainer } from "./widget";
+import { addWidgetContainer, closeSurvey } from "./widget";
 import { trackAction } from "./actions";
 
 const config = Config.getInstance();
@@ -128,6 +128,7 @@ export const checkInitialized = (): Result<void, NotInitializedError> => {
 
 export const deinitalize = (): void => {
   logger.debug("Deinitializing");
+  closeSurvey();
   removeAllEventListeners();
   config.resetConfig();
   isInitialized = false;
diff --git a/packages/js/src/lib/person.ts b/packages/js/src/lib/person.ts
index c12053d1d0..feb72338d8 100644
--- a/packages/js/src/lib/person.ts
+++ b/packages/js/src/lib/person.ts
@@ -5,6 +5,7 @@ import { deinitalize, initialize } from "./initialize";
 import { Logger } from "./logger";
 import { sync } from "./sync";
 import { FormbricksAPI } from "@formbricks/api";
+import { closeSurvey } from "./widget";
 
 const config = Config.getInstance();
 const logger = Logger.getInstance();
@@ -102,6 +103,7 @@ export const logoutPerson = async (): Promise<void> => {
 
 export const resetPerson = async (): Promise<Result<void, NetworkError>> => {
   logger.debug("Resetting state & getting new state from backend");
+  closeSurvey();
   const syncParams = {
     environmentId: config.get().environmentId,
     apiHost: config.get().apiHost,