diff --git a/deploy.sh b/deploy.sh
index 2919713..7da2a2f 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -85,7 +85,7 @@ cp console2web/console2web.py /usr/bin/console2web
 "$(dirname "$0")"/scripts/deploy_xonotic.sh
 "$(dirname "$0")"/scripts/deploy_xonotic-br.sh
 "$(dirname "$0")"/scripts/deploy_armagetron_advanced.sh
-"$(dirname "$0")"/scripts/deploy_soldat.sh
+"$(dirname "$0")"/scripts/deploy_opensoldat.sh
 "$(dirname "$0")"/scripts/deploy_supertuxparty.sh
 
 # Apply all pending firewall rules. NGINX shouldn't have to be restarted, but it seems to help.
diff --git a/scripts/deploy_soldat.sh b/scripts/deploy_opensoldat.sh
similarity index 92%
rename from scripts/deploy_soldat.sh
rename to scripts/deploy_opensoldat.sh
index 7814ab3..8d7d64c 100755
--- a/scripts/deploy_soldat.sh
+++ b/scripts/deploy_opensoldat.sh
@@ -15,9 +15,9 @@ cd ${builddir}
 if [ -d soldat ]; then
   rm -rf soldat
 fi
-git clone https://github.com/Soldat/soldat.git
-git clone https://github.com/Soldat/base.git
-cd soldat
+git clone https://github.com/opensoldat/opensoldat.git
+git clone https://github.com/opensoldat/base.git
+cd opensoldat
 mkdir build && cd build
 cmake -DCMAKE_INSTALL_PREFIX=/opt/soldat ..
 make
@@ -50,7 +50,9 @@ bots_chat false
 sv_maplist "mapslist_ctf.txt"
 EOF
 
-ln -s ./server_dm.cfg /opt/soldat/bin/configs/server.cfg
+if ! [ -L /opt/soldat/bin/configs/server.cfg ]; then
+  ln -s ./server_dm.cfg /opt/soldat/bin/configs/server.cfg
+fi
 
 cat > /opt/soldat/bin/configs/mapslist.txt <<EOF
 Aero