diff --git a/Makefile b/Makefile
index 30021123705d4f6920a497bc3f4fdefffe886286..752bc43499bdaac4fd81fb531888a6669e4fd142 100644
--- a/Makefile
+++ b/Makefile
@@ -169,6 +169,8 @@ logs:
 clean:
 	docker-compose down
 	docker volume rm fda-services_fda-metadata-db-data || true
+	docker volume rm fda-public || true
+	docker volume rm fda-userdb || true
 
 teardown:
 	./.rhel-prod/teardown
diff --git a/fda-analyse-service/Dockerfile b/fda-analyse-service/Dockerfile
index 6a0c075bc253c5773e91c8e05b68656a22943a2e..7fca5435b2e8cb4ba598dfdca835d3b6feff36b7 100644
--- a/fda-analyse-service/Dockerfile
+++ b/fda-analyse-service/Dockerfile
@@ -12,7 +12,7 @@ COPY requirements.txt requirements.txt
 
 RUN pip install -r requirements.txt > /dev/null
 
-HEALTHCHECK --interval=25s --timeout=3s --retries=2 CMD ./service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD ./service_ready
 
 COPY ./as-yml ./
 COPY ./*.py ./
diff --git a/fda-authentication-service/Dockerfile b/fda-authentication-service/Dockerfile
index 33a2c8dc931d037b7eb49b6c7bdfa758aef384aa..d2512788ad04c72cae07dfd0d5b8e13f16082476 100644
--- a/fda-authentication-service/Dockerfile
+++ b/fda-authentication-service/Dockerfile
@@ -26,7 +26,7 @@ VOLUME /tmp
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
 COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
 
diff --git a/fda-broker-service/Dockerfile b/fda-broker-service/Dockerfile
index 167f5aad08023400b3dabafc89ebfb8e4bc7de53..55357fa97b3fea17d479179a8659110ca744d383 100644
--- a/fda-broker-service/Dockerfile
+++ b/fda-broker-service/Dockerfile
@@ -6,4 +6,4 @@ RUN chmod +x /usr/bin/service_ready
 
 COPY ./rabbitmq.conf /etc/rabbitmq/
 
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
\ No newline at end of file
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
\ No newline at end of file
diff --git a/fda-citation-service/Dockerfile b/fda-citation-service/Dockerfile
index c33450b0d1b676a8f5671f7ca1b2591cf7d631de..c2258f9d100c53fb8df2293989d6848bbb3d982c 100644
--- a/fda-citation-service/Dockerfile
+++ b/fda-citation-service/Dockerfile
@@ -24,7 +24,7 @@ FROM openjdk:11-jre-slim as runtime
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
 COPY --from=build ./rest-service/target/rest-service-*.jar ./rest.jar
 
diff --git a/fda-container-service/Dockerfile b/fda-container-service/Dockerfile
index dee2b4fff087fbf8419ab04f03d534ecd52c43a6..ab6ed411c39bb354623f1588639362dea3b659d8 100644
--- a/fda-container-service/Dockerfile
+++ b/fda-container-service/Dockerfile
@@ -24,7 +24,7 @@ FROM openjdk:11-jre-slim as runtime
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
 COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
 
diff --git a/fda-database-service/Dockerfile b/fda-database-service/Dockerfile
index d904bc64f51825b80de0360a56ea97af2832c5dd..37f6af6d91a35b1a94c4c25f76c59031c50d0694 100644
--- a/fda-database-service/Dockerfile
+++ b/fda-database-service/Dockerfile
@@ -24,7 +24,7 @@ FROM openjdk:11-jre-slim as runtime
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
 COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
 
diff --git a/fda-discovery-service/Dockerfile b/fda-discovery-service/Dockerfile
index 4394f693e9454136317b3047bb2dbf6cae42febf..34efa364a4e93fa7747645d640020302d22e6203 100644
--- a/fda-discovery-service/Dockerfile
+++ b/fda-discovery-service/Dockerfile
@@ -18,7 +18,7 @@ FROM openjdk:11-jre-slim as runtime
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
 COPY --from=build ./discovery/target/discovery-*.jar ./discovery.jar
 
diff --git a/fda-gateway-service/Dockerfile b/fda-gateway-service/Dockerfile
index 5a28e0e216445d5bb8d3b80785545611a407748c..ac41d0f03d2cee9d026dc562ed4abdf69b27a302 100644
--- a/fda-gateway-service/Dockerfile
+++ b/fda-gateway-service/Dockerfile
@@ -18,7 +18,7 @@ FROM openjdk:11-jre-slim as runtime
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
 COPY --from=build ./gateway/target/gateway-*.jar ./gateway.jar
 
diff --git a/fda-metadata-db/Dockerfile b/fda-metadata-db/Dockerfile
index 5bde8a89c6be222ad8a434973dbba703508f1c5c..51ea8b6ec4605399e0e2b5bbc0a9fb4693362d12 100644
--- a/fda-metadata-db/Dockerfile
+++ b/fda-metadata-db/Dockerfile
@@ -19,7 +19,7 @@ RUN mvn -q clean install > /dev/null
 FROM postgres:latest as runtime
 
 # Scripts are copied to /docker-entrypoint-initdb.d/ in docker-compose from analyze service
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD pg_isready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD pg_isready
 
 COPY ./initi.sh /docker-entrypoint-initdb.d/
 RUN chmod +x /docker-entrypoint-initdb.d/initi.sh
diff --git a/fda-query-service/Dockerfile b/fda-query-service/Dockerfile
index a1b52c191cf31d48d9ecd4bb4202a34742e4b88a..0310181995d7278441d1476d60693f4482a635b3 100644
--- a/fda-query-service/Dockerfile
+++ b/fda-query-service/Dockerfile
@@ -24,7 +24,7 @@ FROM openjdk:11-jre-slim as runtime
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
 COPY --from=build ./rest-service/target/rest-service-*.jar ./rest-service.jar
 
diff --git a/fda-table-service/Dockerfile b/fda-table-service/Dockerfile
index d4639d29949880c4d44c9cadaa3baa1d7c1a4a9c..6cacb7df5bab7bd3e88076f6d80a923afe21fb79 100644
--- a/fda-table-service/Dockerfile
+++ b/fda-table-service/Dockerfile
@@ -24,7 +24,7 @@ FROM openjdk:11-jre-slim as runtime
 COPY ./service_ready /usr/bin
 RUN chmod +x /usr/bin/service_ready
 
-HEALTHCHECK --interval=10s --timeout=3s --retries=6 CMD service_ready
+HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
 
 COPY --from=build ./rest-service/target/rest-service-*.jar ./rest.jar
 
diff --git a/fda-ui/nuxt.config.js b/fda-ui/nuxt.config.js
index ae0deb02642bbea6df36abdf0a239e48ea530e67..4dce4966bd1705b47b092f04f6c7fa671e804b29 100644
--- a/fda-ui/nuxt.config.js
+++ b/fda-ui/nuxt.config.js
@@ -110,6 +110,14 @@ export default {
   },
 
   build: {
+    loaders: {
+      sass: {
+        implementation: require('sass')
+      },
+      scss: {
+        implementation: require('sass')
+      }
+    },
     babel: {
       presets (env, [preset, options]) {
         return [
diff --git a/fda-ui/yarn.lock b/fda-ui/yarn.lock
index a449d83bf9881412a4f7cea917452133a22c06d7..7049b466a68184f9cd2498a4be0c7fd761806b16 100644
--- a/fda-ui/yarn.lock
+++ b/fda-ui/yarn.lock
@@ -6333,6 +6333,11 @@
   "resolved" "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz"
   "version" "5.1.9"
 
+"immutable@^4.0.0":
+  "integrity" "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
+  "resolved" "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz"
+  "version" "4.0.0"
+
 "import-cwd@^2.0.0":
   "integrity" "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk="
   "resolved" "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz"