diff --git a/.docker/add-env-vars.sh b/.docker/add-env-vars.sh
index cf5dabc..466735e 100644
--- a/.docker/add-env-vars.sh
+++ b/.docker/add-env-vars.sh
@@ -1,33 +1,7 @@
 _writeFrontendEnvVars() {
-    ENV_JSON="$(jq --compact-output --null-input 'env | with_entries(select(.key | startswith("REACT_APP_")))')"
+    ENV_JSON="$(jq --compact-output --null-input 'env | with_entries(select(.key | startswith("VITE_")))')"
     ENV_JSON_ESCAPED="$(printf "%s" "${ENV_JSON}" | sed -e 's/[\&/]/\\&/g')"
     sed -i "s/<noscript id=\"env-insertion-point\"><\/noscript>/<script>var ENV=${ENV_JSON_ESCAPED}<\/script>/g" ${PUBLIC_HTML}index.html
 }
 
-_writeNginxEnvVars() {
-    dockerize -template /etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
-}
-
-_addSslConfig() {
-    SSL_CERTIFICATE=/etc/nginx/ssl/${1}/fullchain.pem;
-    SSL_CERTIFICATE_KEY=/etc/nginx/ssl/${1}/privkey.pem;
-    FILE_CONF=/etc/nginx/sites.d/${1}.conf
-    FILE_SSL_CONF=/etc/nginx/conf.d/00-ssl-redirect.conf;
-
-    if [ -f ${SSL_CERTIFICATE} ] && [ -f ${SSL_CERTIFICATE_KEY} ]; then
-        echo "saving ssl config in ${FILE_CONF}"
-        echo 'include include.d/ssl-redirect.conf;' >> ${FILE_SSL_CONF};
-        echo 'include "include.d/ssl.conf";' >> ${FILE_CONF};
-        echo "ssl_certificate ${SSL_CERTIFICATE};" >> ${FILE_CONF};
-        echo "ssl_certificate_key ${SSL_CERTIFICATE_KEY};" >> ${FILE_CONF};
-    else
-        echo 'listen 80;' >> ${FILE_CONF};
-        echo "ssl ${1} not found >> ${SSL_CERTIFICATE} -> ${SSL_CERTIFICATE_KEY}"
-    fi;
-}
-
 _writeFrontendEnvVars;
-_writeNginxEnvVars;
-
-# _addSslConfig 'backend'
-# _addSslConfig 'frontend'
\ No newline at end of file
diff --git a/.docker/nginx/conf.d/default.conf b/.docker/nginx/conf.d/default.conf
deleted file mode 100644
index 7c198a5..0000000
--- a/.docker/nginx/conf.d/default.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-client_max_body_size 20M;
-
-# upstream backend {
-#     server {{ .Env.URL_BACKEND }};
-# }
-
-server {
-    index index.html;
-    root /var/www/public/;
-
-    {{ if .Env.FRONTEND_SERVER_NAME }}
-    server_name {{ .Env.FRONTEND_SERVER_NAME }};
-    {{else}}
-    server_name _;
-    {{end}}
-
-    include sites.d/frontend.conf;
-    # include include.d/letsencrypt.conf;
-}
-
-# {{if .Env.BACKEND_SERVER_NAME}}
-# server {
-#     server_name {{ .Env.BACKEND_SERVER_NAME }};
-#     include sites.d/backend.conf;
-#     include include.d/letsencrypt.conf;
-# }
-# {{end}}
\ No newline at end of file
diff --git a/.docker/nginx/include.d/allcache.conf b/.docker/nginx/include.d/allcache.conf
deleted file mode 100644
index 36aa6d2..0000000
--- a/.docker/nginx/include.d/allcache.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-expires 1y;
-add_header Cache-Control "public";
-access_log off;
diff --git a/.docker/nginx/include.d/letsencrypt.conf b/.docker/nginx/include.d/letsencrypt.conf
deleted file mode 100644
index def423b..0000000
--- a/.docker/nginx/include.d/letsencrypt.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-#############################################################################
-# Configuration file for Let's Encrypt ACME Challenge location
-# This file is already included in listen_xxx.conf files.
-# Do NOT include it separately!
-#############################################################################
-#
-# This config enables to access /.well-known/acme-challenge/xxxxxxxxxxx
-# on all our sites (HTTP), including all subdomains.
-# This is required by ACME Challenge (webroot authentication).
-# You can check that this location is working by placing ping.txt here:
-# /var/www/letsencrypt/.well-known/acme-challenge/ping.txt
-# And pointing your browser to:
-# http://xxx.domain.tld/.well-known/acme-challenge/ping.txt
-#
-# Sources:
-# https://community.letsencrypt.org/t/howto-easy-cert-generation-and-renewal-with-nginx/3491
-#
-#############################################################################
-
-# Rule for legitimate ACME Challenge requests (like /.well-known/acme-challenge/xxxxxxxxx)
-# We use ^~ here, so that we don't check other regexes (for speed-up). We actually MUST cancel
-# other regex checks, because in our other config files have regex rule that denies access to files with dotted names.
-location ^~ /.well-known/acme-challenge/ {
-
-    # Set correct content type. According to this:
-    # https://community.letsencrypt.org/t/using-the-webroot-domain-verification-method/1445/29
-    # Current specification requires "text/plain" or no content header at all.
-    # It seems that "text/plain" is a safe option.
-    default_type "text/plain";
-
-    # This directory must be the same as in /etc/letsencrypt/cli.ini
-    # as "webroot-path" parameter. Also don't forget to set "authenticator" parameter
-    # there to "webroot".
-    # Do NOT use alias, use root! Target directory is located here:
-    # /var/www/common/letsencrypt/.well-known/acme-challenge/
-    root         /var/www/letsencrypt;
-    autoindex on;
-}
-
-# Hide /acme-challenge subdirectory and return 404 on all requests.
-# It is somewhat more secure than letting Nginx return 403.
-# Ending slash is important!
-location = /.well-known/acme-challenge/ {
-    return 404;
-}
diff --git a/.docker/nginx/include.d/nocache.conf b/.docker/nginx/include.d/nocache.conf
deleted file mode 100644
index d2f4f9d..0000000
--- a/.docker/nginx/include.d/nocache.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-add_header Last-Modified $date_gmt;
-add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
-if_modified_since off;
-expires off;
-etag off;
\ No newline at end of file
diff --git a/.docker/nginx/include.d/spa.conf b/.docker/nginx/include.d/spa.conf
deleted file mode 100644
index 09aac30..0000000
--- a/.docker/nginx/include.d/spa.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# X-Frame-Options is to prevent from clickJacking attack
-add_header X-Frame-Options SAMEORIGIN;
-
-# disable content-type sniffing on some browsers.
-add_header X-Content-Type-Options nosniff;
-
-# This header enables the Cross-site scripting (XSS) filter
-add_header X-XSS-Protection "1; mode=block";
-
-# This will enforce HTTP browsing into HTTPS and avoid ssl stripping attack
-add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;";
-
-add_header Referrer-Policy "no-referrer-when-downgrade";
-
-# Enables response header of "Vary: Accept-Encoding"
-gzip_vary on;
\ No newline at end of file
diff --git a/.docker/nginx/include.d/ssl-redirect.conf b/.docker/nginx/include.d/ssl-redirect.conf
deleted file mode 100644
index 1684eb6..0000000
--- a/.docker/nginx/include.d/ssl-redirect.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-server {
-	listen         80;
-	listen    [::]:80;
-	return         302 https://$host$request_uri;
-}
\ No newline at end of file
diff --git a/.docker/nginx/include.d/ssl.conf b/.docker/nginx/include.d/ssl.conf
deleted file mode 100644
index 96952da..0000000
--- a/.docker/nginx/include.d/ssl.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-listen 443 ssl http2;
-listen [::]:443 ssl http2;
\ No newline at end of file
diff --git a/.docker/nginx/sites.d/backend.conf b/.docker/nginx/sites.d/backend.conf
deleted file mode 100644
index a503ee1..0000000
--- a/.docker/nginx/sites.d/backend.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-location / {
-    proxy_pass http://backend;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection 'upgrade';
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_cache_bypass $http_upgrade;
-}
diff --git a/.docker/nginx/sites.d/frontend.conf b/.docker/nginx/sites.d/frontend.conf
deleted file mode 100644
index 9813e24..0000000
--- a/.docker/nginx/sites.d/frontend.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-location / {
-    try_files $uri $uri/ /index.html;
-    include include.d/nocache.conf;
-}
-
-location /static {
-   alias /var/www/public/static/;
-   include include.d/allcache.conf;
-}
-
-include "include.d/spa.conf";
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..afb3bc6
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,16 @@
+node_modules/
+dist/
+build/
+.git/
+.gitignore
+.github/
+*.log
+.env
+.env.*
+.DS_Store
+Thumbs.db
+*.tsbuildinfo
+tmp/
+temp/
+coverage/
+.nyc_output/
diff --git a/Dockerfile b/Dockerfile
index a85b68c..6258d72 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,8 +15,6 @@ COPY tsconfig.json ./
 COPY tsconfig.app.json ./
 COPY tsconfig.node.json ./
 COPY vite.config.ts ./
-COPY postcss.config.js ./
-COPY tailwind.config.js ./
 COPY index.html ./
 COPY components.json ./
 COPY public/ ./public/
diff --git a/docker-compose.yml b/docker-compose.yml
index 7fbf3ca..bc9e3c6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   evolution-manager:
     build:
@@ -9,8 +7,11 @@ services:
       - "3000:80"
     container_name: evolution-manager-v2
     restart: unless-stopped
-    environment:
-      - NODE_ENV=production
+    healthcheck:
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost/health"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
     networks:
       - evolution-network
 
diff --git a/docker_build.sh b/docker_build.sh
index cf75d21..87fa14d 100644
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
-VERSION=$1
+set -e
 
-docker build -t atendai/evolution-manager-v2:${VERSION} .
-docker push atendai/evolution-manager-v2:${VERSION}
+VERSION=${1:?Usage: $0 <version>}
+IMAGE="evolutionfoundation/evolution-manager-v2"
+
+docker buildx build \
+  --platform linux/amd64,linux/arm64 \
+  --tag "${IMAGE}:${VERSION}" \
+  --tag "${IMAGE}:latest" \
+  --push \
+  .