diff --git a/src/freedombone-app-jitsi b/src/freedombone-app-jitsi
index c2458f390ec4f0524ffb9ead2274864ee3bb829d..e6b7f656478ae438de24f62ceb6999a762c53029 100755
--- a/src/freedombone-app-jitsi
+++ b/src/freedombone-app-jitsi
@@ -208,8 +208,8 @@ function remove_jitsi {
     remove_nodejs jitsi
 
     # remove videobridge
-    #firewall_remove ${VIDEOBRIDGE_PORT}
-    apt-get -yq remove --purge jitsi-videobridge jicofo jitsi-meet
+    firewall_remove ${VIDEOBRIDGE_PORT}
+    apt-get -yq remove --purge jitsi-videobridge jicofo jitsi-meet jitsi-meet-prosody
     if [ -d /etc/jitsi ]; then
         rm -rf /etc/jitsi
     fi
@@ -217,6 +217,9 @@ function remove_jitsi {
     if [ -d /usr/share/jitsi-videobridge ]; then
         rm -rf /usr/share/jitsi-videobridge
     fi
+    if [ -d /usr/share/jitsi-meet ]; then
+        rm -rf /usr/share/jitsi-meet
+    fi
     sed -i "/jitsi/d" /etc/apt/sources.list
     apt-get update
 
@@ -416,6 +419,10 @@ function install_jitsi {
 
     # install_jitsi_xmpp
 
+    if [ -f /etc/ssl/certs/${JITSI_DOMAIN_NAME}.pem ]; then
+        sed -i "s|.crt|.pem|g" $jitsi_nginx_site
+    fi
+
     function_check nginx_ensite
     nginx_ensite ${JITSI_DOMAIN_NAME}