diff --git a/scripts/install b/scripts/install
index 4b3af45..1d508ef 100755
--- a/scripts/install
+++ b/scripts/install
@@ -190,7 +190,11 @@ ynh_add_systemd_config
 chown -R "$app":"$app" "$final_path"
 
 pushd $final_path/$app
-     su "$app" -s $SHELL -lc "$final_path/$app/bin/pleroma_ctl instance gen --force \
+    #Workaround for static-dir error
+    ynh_replace_string --match_string="_dir" --replace_string="" --target_file="/var/www/pleroma/pleroma/releases/1.1.7/releases.exs"
+    
+    #Generate instance
+    su "$app" -s $SHELL -lc "$final_path/$app/bin/pleroma_ctl instance gen --force \
     --output $config \
     --output-psql /tmp/setup_db.psql \
     --domain $domain \
diff --git a/scripts/remove b/scripts/remove
index cf4eba1..fbdd39c 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -36,6 +36,13 @@ then
 	yunohost service remove $app
 fi
 
+#=================================================
+# STOP ALL PLEROMA SERVICES
+#=================================================
+ynh_print_info --message="Stopping all pleroma services..."
+
+pkill -u $app
+
 #=================================================
 # STOP AND REMOVE SERVICE
 #=================================================