diff --git a/admin/package.json b/admin/package.json
index e34136e4b..522fbd592 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -10,6 +10,7 @@
     "start": "node run/server.js",
     "serve": "vue-cli-service serve --open",
     "build": "vue-cli-service build",
+    "postbuild": "find build -type f -regex '.*\\.\\(html\\|js\\|css\\|svg\\|json\\)' -exec gzip -9 -k {} +",
     "dev": "yarn run serve",
     "analyse-bundle": "yarn build && webpack-bundle-analyzer build/webpack.stats.json",
     "lint": "eslint --max-warnings=0 --ext .js,.vue,.json .",
diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
index d8ed50ba4..047547e91 100644
--- a/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
+++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
@@ -14,8 +14,8 @@ server {
 server {
     server_name $COMMUNITY_HOST;
 
-    listen [::]:443 ssl ipv6only=on;
-    listen 443 ssl;
+    listen [::]:443 ssl ipv6only=on http2;
+    listen 443 ssl http2;
     ssl_certificate $NGINX_SSL_CERTIFICATE;
     ssl_certificate_key $NGINX_SSL_CERTIFICATE_KEY;
     include $NGINX_SSL_INCLUDE;
@@ -33,7 +33,7 @@ server {
         return 444;
     }
 
-    #gzip_static  on;
+    gzip_static  on;
     gzip on;
     gzip_proxied any;
     gzip_types
@@ -53,18 +53,11 @@ server {
 
     # Frontend (default)
     location / {
+        
         limit_req zone=frontend burst=40 nodelay;
         limit_conn addr 40;
-        proxy_http_version 1.1;
-        proxy_set_header   Upgrade $http_upgrade;
-        proxy_set_header   Connection 'upgrade';
-        proxy_set_header   X-Forwarded-For $remote_addr;
-        proxy_set_header   X-Real-IP  $remote_addr;
-        proxy_set_header   Host $host;
+        root $PROJECT_ROOT/frontend/
         
-        proxy_pass         http://127.0.0.1:3000;
-        proxy_redirect     off;
-
         access_log $GRADIDO_LOG_PATH/nginx-access.frontend.log gradido_log;
         error_log $GRADIDO_LOG_PATH/nginx-error.frontend.log warn;
   }
@@ -119,15 +112,7 @@ server {
     location /admin {
         limit_req zone=frontend burst=30 nodelay;
         limit_conn addr 40;
-        proxy_http_version 1.1;
-        proxy_set_header   Upgrade $http_upgrade;
-        proxy_set_header   Connection 'upgrade';
-        proxy_set_header   X-Forwarded-For $remote_addr;
-        proxy_set_header   X-Real-IP  $remote_addr;
-        proxy_set_header   Host $host;
-        
-        proxy_pass         http://127.0.0.1:8080/;
-        proxy_redirect     off;
+        root $PROJECT_ROOT/admin/
 
         access_log $GRADIDO_LOG_PATH/nginx-access.admin.log gradido_log;
         error_log $GRADIDO_LOG_PATH/nginx-error.admin.log warn;
diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
index e0f382467..a61fbee47 100644
--- a/deployment/bare_metal/nginx/sites-available/gradido.conf.template
+++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
@@ -18,7 +18,7 @@ server {
         return 444;
     }
 
-    #gzip_static  on;
+    gzip_static  on;
     gzip on;
     gzip_proxied any;
     gzip_types
@@ -40,15 +40,7 @@ server {
     location / {
         limit_req zone=frontend burst=40 nodelay;
         limit_conn addr 40;
-        proxy_http_version 1.1;
-        proxy_set_header   Upgrade $http_upgrade;
-        proxy_set_header   Connection 'upgrade';
-        proxy_set_header   X-Forwarded-For $remote_addr;
-        proxy_set_header   X-Real-IP  $remote_addr;
-        proxy_set_header   Host $host;
-        
-        proxy_pass         http://127.0.0.1:3000;
-        proxy_redirect     off;
+        root $PROJECT_ROOT/frontend/
 
         access_log $GRADIDO_LOG_PATH/nginx-access.frontend.log gradido_log;
         error_log $GRADIDO_LOG_PATH/nginx-error.frontend.log warn;
@@ -104,15 +96,7 @@ server {
     location /admin {
         limit_req zone=frontend burst=30 nodelay;
         limit_conn addr 40;
-        proxy_http_version 1.1;
-        proxy_set_header   Upgrade $http_upgrade;
-        proxy_set_header   Connection 'upgrade';
-        proxy_set_header   X-Forwarded-For $remote_addr;
-        proxy_set_header   X-Real-IP  $remote_addr;
-        proxy_set_header   Host $host;
-        
-        proxy_pass         http://127.0.0.1:8080/;
-        proxy_redirect     off;
+        root $PROJECT_ROOT/admin/
 
         access_log $GRADIDO_LOG_PATH/nginx-access.admin.log gradido_log;
         error_log $GRADIDO_LOG_PATH/nginx-error.admin.log warn;
diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index 4b6498ee0..222e13f81 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -237,8 +237,8 @@ export NODE_ENV=production
 
 # start after building all to use up less ressources
 pm2 start --name gradido-backend "yarn --cwd $PROJECT_ROOT/backend start" -l $GRADIDO_LOG_PATH/pm2.backend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
-pm2 start --name gradido-frontend "yarn --cwd $PROJECT_ROOT/frontend start" -l $GRADIDO_LOG_PATH/pm2.frontend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
-pm2 start --name gradido-admin "yarn --cwd $PROJECT_ROOT/admin start" -l $GRADIDO_LOG_PATH/pm2.admin.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
+#pm2 start --name gradido-frontend "yarn --cwd $PROJECT_ROOT/frontend start" -l $GRADIDO_LOG_PATH/pm2.frontend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
+#pm2 start --name gradido-admin "yarn --cwd $PROJECT_ROOT/admin start" -l $GRADIDO_LOG_PATH/pm2.admin.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
 pm2 save
 if [ ! -z $FEDERATION_DHT_TOPIC ]; then
   pm2 start --name gradido-dht-node "yarn --cwd $PROJECT_ROOT/dht-node start" -l $GRADIDO_LOG_PATH/pm2.dht-node.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
diff --git a/frontend/package.json b/frontend/package.json
index fb5210a05..1a18388e2 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -6,6 +6,7 @@
     "start": "node run/server.js",
     "serve": "vue-cli-service serve --open",
     "build": "vue-cli-service build",
+    "postbuild": "find build -type f -regex '.*\\.\\(html\\|js\\|css\\|svg\\|json\\)' -exec gzip -9 -k {} +",
     "dev": "yarn run serve",
     "analyse-bundle": "yarn build && webpack-bundle-analyzer build/webpack.stats.json",
     "lint": "eslint --max-warnings=0 --ext .js,.vue,.json .",