diff --git a/.gitmodules b/.gitmodules
index 0d9991a..eece9a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -75,5 +75,7 @@ branch = master
 ignore = dirty
 
 [submodule "repos/splatoon"]
-	path = repos/splatoon
-	url = https://github.com/ashquarky/splatoon
\ No newline at end of file
+path = repos/splatoon
+url = https://github.com/ashquarky/splatoon
+branch = master
+ignore = dirty
\ No newline at end of file
diff --git a/compose.yml b/compose.yml
index 7214f65..43b204e 100644
--- a/compose.yml
+++ b/compose.yml
@@ -469,9 +469,9 @@ services:
       # Go delve debugger
       - 127.0.0.1:2350:2351
       # Authentication server
-      - 61002:61002/udp
+      - 6006:6006/udp
       # Secure server
-      - 61003:61003/udp
+      - 6007:6007/udp
     volumes:
       - type: bind
         source: ./logs/splatoon/
diff --git a/environment/splatoon.env b/environment/splatoon.env
index 804f6c8..12e68f8 100644
--- a/environment/splatoon.env
+++ b/environment/splatoon.env
@@ -1,6 +1,6 @@
 MONGO_URI=mongodb://mongodb:27017/pretendo_account?replicaSet=rs
-PN_SPLATOON_AUTHENTICATION_SERVER_PORT=61002
-PN_SPLATOON_SECURE_SERVER_PORT=61003
+PN_SPLATOON_AUTHENTICATION_SERVER_PORT=6006
+PN_SPLATOON_SECURE_SERVER_PORT=6007
 PN_SPLATOON_ALLOW_PUBLIC_MATCHMAKING=1
 PN_SPLATOON_ACCOUNT_GRPC_HOST=account
-PN_SPLATOON_ACCOUNT_GRPC_PORT=5000
\ No newline at end of file
+PN_SPLATOON_ACCOUNT_GRPC_PORT=5000
diff --git a/scripts/internal/update-account-servers-database.sh b/scripts/internal/update-account-servers-database.sh
index ace07ce..d7539cd 100755
--- a/scripts/internal/update-account-servers-database.sh
+++ b/scripts/internal/update-account-servers-database.sh
@@ -7,7 +7,7 @@ parse_arguments "$@"
 print_info "Setting up Pretendo account servers database..."
 
 load_dotenv .env
-dotenv_files=("friends" "miiverse-api" "wiiu-chat" "super-mario-maker")
+dotenv_files=("friends" "miiverse-api" "wiiu-chat" "super-mario-maker" "splatoon")
 for file in "${dotenv_files[@]}"; do
     load_dotenv "$file.env" "$file.local.env"
 done
diff --git a/scripts/run-in-container/update-account-servers-database.js b/scripts/run-in-container/update-account-servers-database.js
index 52be50b..eaa2532 100644
--- a/scripts/run-in-container/update-account-servers-database.js
+++ b/scripts/run-in-container/update-account-servers-database.js
@@ -86,7 +86,7 @@ async function runAsync() {
     await createNexServer(
         "Splatoon",
         "10162B00",
-        ["00050000-10176A00", "00050000-10176900", "00050000-10162B00"],
+        ["0005000010176A00", "0005000010176900", "0005000010162B00"],
         process.env.SERVER_IP,
         process.env.SPLATOON_PORT,
         1,
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index a2c95c9..98b8533 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -118,7 +118,6 @@ echo "PN_SMM_KERBEROS_PASSWORD=$smm_kerberos_password" >>./super-mario-maker.loc
 
 # Generate a Kerberos password for the Splatoon server
 splat_kerberos_password=$(generate_password 32)
-splat_api_key=$(generate_password 32)
 echo "PN_SPLATOON_KERBEROS_PASSWORD=$splat_kerberos_password" >>./splatoon.local.env
 
 # Generate an AES key for the Miiverse servers
diff --git a/setup.sh b/setup.sh
index 87fd481..58a9fcf 100755
--- a/setup.sh
+++ b/setup.sh
@@ -120,4 +120,4 @@ print_stage "Setting up containers with first-run scripts."
 setup_containers
 
 print_title "Pretendo Network server setup script finished"
-print_success "Setup completed! You can now start your Pretendo Network server with \"docker compose up -d --build\"."
\ No newline at end of file
+print_success "Setup completed! You can now start your Pretendo Network server with \"docker compose up -d --build\"."