diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki
index ebefaff74344697d8bb5f541fdbac66cea67077a..82552d9eafed07d1ef6a06a28f513660e60effdf 100755
--- a/src/freedombone-app-dokuwiki
+++ b/src/freedombone-app-dokuwiki
@@ -173,6 +173,7 @@ function remove_dokuwiki {
     function_check remove_onion_service
     remove_onion_service dokuwiki ${DOKUWIKI_ONION_PORT}
     nginx_dissite $DOKUWIKI_DOMAIN_NAME
+    remove_certs $DOKUWIKI_DOMAIN_NAME
     if [ -f /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME ]; then
         rm /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
     fi
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index ee8614084990c2ce7e3e6c18d154c976182547ae..5dff24a9c05d649dc2a3a5e1f450fb686aba5f06 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -469,6 +469,7 @@ function remove_gnusocial {
     read_config_param "MY_USERNAME"
     echo "Removing $GNUSOCIAL_DOMAIN_NAME"
     nginx_dissite $GNUSOCIAL_DOMAIN_NAME
+    remove_certs $GNUSOCIAL_DOMAIN_NAME
     if [ -d /var/www/$GNUSOCIAL_DOMAIN_NAME ]; then
         rm -rf /var/www/$GNUSOCIAL_DOMAIN_NAME
     fi
diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 19004323e01f05905624158a2a26a19e0164c96d..02334c4b6148184a4681f2d5c4117f94b243abe3 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -337,6 +337,7 @@ function remove_gogs {
     systemctl stop gogs
     systemctl disable gogs
     nginx_dissite ${GIT_DOMAIN_NAME}
+    remove_certs ${GIT_DOMAIN_NAME}
     if [ -d /var/www/${GIT_DOMAIN_NAME} ]; then
         rm -rf /var/www/${GIT_DOMAIN_NAME}
     fi
diff --git a/src/freedombone-app-htmly b/src/freedombone-app-htmly
index 0a37208454d6831152713e3fb02b8f03fc014d60..d792cccc1465d1cd25b5b43d7cb3f5159aba58a2 100755
--- a/src/freedombone-app-htmly
+++ b/src/freedombone-app-htmly
@@ -322,6 +322,7 @@ function remove_htmly {
 
     read_config_param "HTMLY_DOMAIN_NAME"
     nginx_dissite $HTMLY_DOMAIN_NAME
+    remove_certs ${HTMLY_DOMAIN_NAME}
     if [ -f /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME ]; then
         rm -f /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
     fi
diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla
index 34468d933cf5157ad9cf4e2c1978e331af44261c..2b9ef47fa994a5de9106bed7aa6e23309b7511fc 100755
--- a/src/freedombone-app-hubzilla
+++ b/src/freedombone-app-hubzilla
@@ -279,6 +279,7 @@ function remove_hubzilla {
         return
     fi
     nginx_dissite $HUBZILLA_DOMAIN_NAME
+    remove_certs ${HUBZILLA_DOMAIN_NAME}
     if [ -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then
         rm -rf /var/www/$HUBZILLA_DOMAIN_NAME
     fi
diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin
index aaf5a86d01a39541e016b6c5a89ceb87756fb58d..1342dad3c275194391dcd58b775d06c57d4f6e4f 100755
--- a/src/freedombone-app-mediagoblin
+++ b/src/freedombone-app-mediagoblin
@@ -170,7 +170,7 @@ function restore_remote_mediagoblin {
 }
 
 function remove_mediagoblin {
-    echo -n ''
+    remove_certs ${MEDIAGOBLIN_DOMAIN_NAME}
 }
 
 function install_mediagoblin {
diff --git a/src/freedombone-app-mumble b/src/freedombone-app-mumble
index ad7020d57a545ce7501894f9fd1d27ba04066087..500905a18349a5b36fa9d673b89c64eb31872c2d 100755
--- a/src/freedombone-app-mumble
+++ b/src/freedombone-app-mumble
@@ -166,6 +166,7 @@ function remove_mumble {
     if [ -f /etc/mumble-server.ini ]; then
         rm /etc/mumble-server.ini
     fi
+    remove_certs mumble
     function_check remove_onion_service
     remove_onion_service mumble ${MUMBLE_PORT}
     sed -i '/mumble/d' $COMPLETION_FILE
diff --git a/src/freedombone-app-pelican b/src/freedombone-app-pelican
index 444d2e4aee7595d2366ffe24c6b9ea5ad586328c..789b03074f383efc03d3e5c69d7172157faed1fd 100755
--- a/src/freedombone-app-pelican
+++ b/src/freedombone-app-pelican
@@ -82,6 +82,7 @@ function remove_pelican {
         rm -rf /var/www/$STATIC_BLOG_DOMAIN/htdocs
     fi
     pip uninstall pelican
+    remove_certs $STATIC_BLOG_DOMAIN
 }
 
 function create_pelican_conf {
diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 175301bc0c6d138fe774256f3d80b8add5122239..156f6ed0b8d3244777a7e83d8c07be6b1481afb1 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -266,6 +266,7 @@ function configure_firewall_for_xmpp {
 function remove_xmpp_client {
     apt-get -y remove --purge profanity
     remove_completion_param install_xmpp_client
+    remove_certs xmpp
 }
 
 function remove_xmpp {
diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web
index bf41f22e51753ec5c7e7a6e9311fe2869050ef46..11b5c72ca508a993e6597ce55551d3af9984c586 100755
--- a/src/freedombone-utils-web
+++ b/src/freedombone-utils-web
@@ -567,4 +567,28 @@ function install_web_server {
     mark_completed $FUNCNAME
 }
 
+function remove_certs {
+    domain_name=$1
+
+    if [ ! $domain_name ]; then
+        return
+    fi
+
+    if [ -f /etc/ssl/certs/${domain_name}.dhparam ]; then
+        rm /etc/ssl/certs/${domain_name}.dhparam
+    fi
+
+    if [ -f /etc/ssl/certs/${domain_name}.pem ]; then
+        rm /etc/ssl/certs/${domain_name}.pem
+    fi
+
+    if [ -f /etc/ssl/certs/${domain_name}.crt ]; then
+        rm /etc/ssl/certs/${domain_name}.crt
+    fi
+
+    if [ -f /etc/ssl/private/${domain_name}.key ]; then
+        rm /etc/ssl/private/${domain_name}.key
+    fi
+}
+
 # NOTE: deliberately no exit 0