diff --git a/.gitignore b/.gitignore
index 8f7afae..2d95a39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,12 @@
 /ftp/home-*
 /gitea/gitea_data
 /gitea/postgres
+/joplin/joplin_data
 /notes/standardfile.db
 /notes/standardfile.yml
 /recipes/mealie
 /teamspeak/data
+/teamspeak/dbvolume
 /terraria/config
 /traefik/letsencrypt
 /traefik/.env
diff --git a/adminscripts/reset.sh b/adminscripts/reset.sh
index 51c052a..aa9a4bf 100755
--- a/adminscripts/reset.sh
+++ b/adminscripts/reset.sh
@@ -1,4 +1,5 @@
 docker kill $(docker ps -q);
+docker network prune -f;
 if [[ $1 == "hard" ]]
 then
 docker system prune -f -a --volumes;
diff --git a/adminscripts/run_all.sh b/adminscripts/run_all.sh
index b45ea08..5bd4a05 100755
--- a/adminscripts/run_all.sh
+++ b/adminscripts/run_all.sh
@@ -1,7 +1,7 @@
 SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
 GLOB_DIR=$SCRIPT_DIR/..
 
-SERVICES=( traefik gitea wizz ftp notes recipes teamspeak )
+SERVICES=( traefik gitea wizz ftp notes recipes teamspeak joplin )
 
 for service in "${SERVICES[@]}"
 do
diff --git a/teamspeak/configure_server.sh b/teamspeak/configure_server.sh
index 9e72d78..84f2420 100755
--- a/teamspeak/configure_server.sh
+++ b/teamspeak/configure_server.sh
@@ -1,6 +1,6 @@
 #required packages: httpie, jq
 
-DOCKER_IP=$(docker inspect --format '{{ range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' teamspeak2)
+DOCKER_IP=$(docker inspect --format '{{ range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' teamspeak)
 BASE_COMMAND="http $DOCKER_IP:10080/1"
 API_KEY="?api-key=$(cat api_key.secret)"
 
diff --git a/teamspeak/docker-compose.yml b/teamspeak/docker-compose.yml
index 3f3cb32..547dd12 100644
--- a/teamspeak/docker-compose.yml
+++ b/teamspeak/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 # Not run through traefik, causes too much slowdown: instead, using a DNS SRV rule.
 services:
   teamspeak:
-    image: teamspeak
+    image: teamspeak:3.13.7
     container_name: teamspeak
     ports:
       - 9987:9987/udp       #udp voice port
@@ -16,7 +16,8 @@ services:
     networks:
       - teamspeak
   db:
-    image: mariadb
+    image: mariadb:11.0.3
+    container_name: teamspeak-db
     restart: always
     env_file: ./secrets/teamspeak.secret
     volumes: