diff --git a/app/roxy-wi.cfg b/app/roxy-wi.cfg
index bae3dea5..bfba22c4 100644
--- a/app/roxy-wi.cfg
+++ b/app/roxy-wi.cfg
@@ -1,20 +1,19 @@
 [main]
-#Path to files destination
+# Path to the files destination
 fullpath = /var/www/haproxy-wi
-log_path = ${fullpath}/log/ 
+log_path = ${fullpath}/log/
 
 [configs]
-#Dir where configs will be save
+# Folders for configs
 haproxy_save_configs_dir = ${main:fullpath}/configs/hap_config/
 kp_save_configs_dir = ${main:fullpath}/configs/kp_config/
 nginx_save_configs_dir = ${main:fullpath}/configs/nginx_config/
 
 [mysql]
-#Enable MySQL DB. Default will be used Sqlite DB. Default disable
+# By default Sqlite DB is used
 enable = 0
-mysql_user = haproxy-wi
-mysql_password = haproxy-wi
-mysql_db = haproxywi
+mysql_user = roxy-wi
+mysql_password = roxy-wi
+mysql_db = roxywi
 mysql_host = 127.0.0.1
 mysql_port = 3306
-
diff --git a/config_other/httpd/roxy-wi.conf b/config_other/httpd/roxy-wi.conf
index b86ef88c..95dbfa9b 100644
--- a/config_other/httpd/roxy-wi.conf
+++ b/config_other/httpd/roxy-wi.conf
@@ -12,6 +12,10 @@
 	TimeOut 600
 	LimitRequestLine 16380
 
+  RewriteEngine On
+  RewriteCond %{HTTP:Upgrade} =websocket [NC]
+  RewriteRule /(.*)           ws://localhost:8765/ [P,L]
+  ProxyPassReverse / http://localhost:8765/
     WSGIDaemonProcess api display-name=%{GROUP} user=apache group=apache processes=1 threads=5
     WSGIScriptAlias /api /var/www/haproxy-wi/api/app.wsgi
 
@@ -51,7 +55,7 @@
   		Order Deny,Allow
   		Deny from all
 	</FilesMatch>
-	
+
 	<FilesMatch "\.db$">
   		Order Deny,Allow
   		Deny from all
@@ -69,4 +73,4 @@
 			Header set Cache-Control "max-age=86400, public"
 		</filesMatch>
 	</IfModule>
-</VirtualHost>
\ No newline at end of file
+</VirtualHost>
diff --git a/config_other/httpd/roxy-wi_deb.conf b/config_other/httpd/roxy-wi_deb.conf
index a228a6c7..df0ed9cc 100644
--- a/config_other/httpd/roxy-wi_deb.conf
+++ b/config_other/httpd/roxy-wi_deb.conf
@@ -12,6 +12,11 @@
     TimeOut 600
     LimitRequestLine 16380
 
+    RewriteEngine On
+    RewriteCond %{HTTP:Upgrade} =websocket [NC]
+    RewriteRule /(.*)           ws://localhost:8765/ [P,L]
+    ProxyPassReverse / http://localhost:8765/
+
     WSGIDaemonProcess api display-name=%{GROUP} user=www-data group=www-data processes=1 threads=5
     WSGIScriptAlias /api /var/www/haproxy-wi/api/app.wsgi
 
@@ -51,7 +56,7 @@
   		Order Deny,Allow
   		Deny from all
 	</FilesMatch>
-	
+
 	<FilesMatch "\.db$">
   		Order Deny,Allow
   		Deny from all