diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index 75294c3fc4..2733516e79 100755
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -35,6 +35,7 @@ services:
       MERLIN_DB_USER: "${AERIE_USERNAME}"
       MERLIN_LOCAL_STORE: /usr/src/app/merlin_file_store
       MERLIN_PORT: 27183
+      ENABLE_CONTINUOUS_VALIDATION_THREAD: true
       JAVA_OPTS: >
         -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN
         -Dorg.slf4j.simpleLogger.logFile=System.err
@@ -143,7 +144,6 @@ services:
     environment:
       ORIGIN: http://localhost
       PUBLIC_AERIE_FILE_STORE_PREFIX: "/usr/src/app/merlin_file_store/"
-      PUBLIC_LOGIN_PAGE: "enabled"
       PUBLIC_GATEWAY_CLIENT_URL: http://localhost:9000
       PUBLIC_GATEWAY_SERVER_URL: http://aerie_gateway:9000
       PUBLIC_HASURA_CLIENT_URL: http://localhost:8080/v1/graphql
diff --git a/docker-compose.yml b/docker-compose.yml
index 9df4a80fea..a1c323f1ad 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -108,7 +108,6 @@ services:
     environment:
       NODE_TLS_REJECT_UNAUTHORIZED: "0"
       PUBLIC_AERIE_FILE_STORE_PREFIX: "/usr/src/app/merlin_file_store/"
-      PUBLIC_LOGIN_PAGE: "enabled"
       ORIGIN: http://localhost
       PUBLIC_GATEWAY_CLIENT_URL: http://localhost:9000
       PUBLIC_GATEWAY_SERVER_URL: http://aerie_gateway:9000
diff --git a/e2e-tests/docker-compose-many-workers.yml b/e2e-tests/docker-compose-many-workers.yml
index e0a8277254..a936866e93 100644
--- a/e2e-tests/docker-compose-many-workers.yml
+++ b/e2e-tests/docker-compose-many-workers.yml
@@ -104,7 +104,6 @@ services:
     environment:
       NODE_TLS_REJECT_UNAUTHORIZED: "0"
       PUBLIC_AERIE_FILE_STORE_PREFIX: "/usr/src/app/merlin_file_store/"
-      PUBLIC_LOGIN_PAGE: "enabled"
       ORIGIN: http://localhost
       PUBLIC_GATEWAY_CLIENT_URL: http://localhost:9000
       PUBLIC_GATEWAY_SERVER_URL: http://aerie_gateway:9000