diff --git a/Dockerfile b/Dockerfile
index 145b10a..a280fa9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ WORKDIR $INSTDIR
 RUN ( wget -O ${InstallerJar} ${ForgeUrl1} || wget -O ${InstallerJar} ${ForgeUrl2} ) && \
     echo "eula=true" > eula.txt && \
     java -jar ./${InstallerJar} --installServer && rm -f ${InstallerJar} && \
-    ln -s "forge-${MINECRAFT}-*.jar" forge.jar || exit 2
+    ln -s "forge-${MINECRAFT}-${FORGE}.jar" forge.jar || exit 2
 
 COPY entrypoint.sh /usr/bin
 
diff --git a/entrypoint.sh b/entrypoint.sh
index f48149c..e43a481 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -12,7 +12,7 @@ rmln() {
 
 rmln "$INSTDIR/forge.jar"                       "$RUNDIR/forge.jar"
 rmln "$INSTDIR/libraries"                       "$RUNDIR/libraries"
-rmln "$INSTDIR/minecraft_server.$MineVers.jar"  "$RUNDIR/minecraft_server.$MineVers.jar"
+rmln "$INSTDIR/minecraft_server.$MINECRAFT.jar"  "$RUNDIR/minecraft_server.$MINECRAFT.jar"
 rmln "$INSTDIR/eula.txt"                        "$RUNDIR/eula.txt"
 
 ( echo "MINECRAFT=${MINECRAFT}"; echo "FORGE=${FORGE}" ) > $RUNDIR/version.info