diff --git a/ci/ci_check.sh b/ci/ci_check.sh
index 324e81b..a6b212f 100755
--- a/ci/ci_check.sh
+++ b/ci/ci_check.sh
@@ -6,12 +6,13 @@ TEST_MGMT_PASS=pass1
 
 function pre_build_cleanup {
   echo "==== Pre build clean up (just in case some rubbish was left by the previous build) ===="
+  sudo docker rm -f hc dc infinispan-server-ci
   sudo docker rmi -f infinispan-server
 }
 
 function build_images {
   echo "==== Building images ===="
-  sudo docker build --no-cache --force-rm -t infinispan-server ../server
+  sudo docker build --no-cache --force-rm -t infinispan-server ../server || die "Error building the image"
 }
 
 function start_server {
diff --git a/server/Dockerfile b/server/Dockerfile
index 2251e59..84aeace 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -11,7 +11,7 @@ ENV INFINISPAN_VERSION 9.3.0.Alpha1
 ENV LAUNCH_JBOSS_IN_BACKGROUND true
 
 # Server download location
-ENV DISTRIBUTION_URL https://repository.jboss.org/nexus/content/repositories/releases/org/infinispan/server/infinispan-server-build/$INFINISPAN_VERSION/infinispan-server-build-$INFINISPAN_VERSION.zip
+ENV DISTRIBUTION_URL https://downloads.jboss.org/infinispan/$INFINISPAN_VERSION/infinispan-server-$INFINISPAN_VERSION.zip
 
 # Labels
 LABEL name="Infinispan Server" \