diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd20a0e5f7996fc23519620021a5977adc0fd51e..22886cb51124e48a41b6a533f4f09e9914e38c70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,12 @@ variables:
 build:
   stage: build
   script:
-    - docker login -u recolic -p "$docker_pswd"
     - cd docker-pikaur/ && docker build -t recolic/pikaur .
+
+upload:
+  stage: deploy
+  script:
+    - docker login -u recolic -p "$docker_pswd"
     - docker push recolic/pikaur
+  allow_failure: true
 
diff --git a/aur-sync.sh b/aur-sync.sh
index 775f1366d012f0d305fcff783ea59f7acc71f90c..d9acf614b096ccef304b147c6eadfa1a947f614e 100755
--- a/aur-sync.sh
+++ b/aur-sync.sh
@@ -96,6 +96,9 @@ function dedup_and_build_index () {
     return $?
 }
 
+# Must update arch toolchain
+docker pull recolic/pikaur
+
 mkdir -p "$build_outdir"
 sync_aur || echo AUR-gg
 sync_repo || echo REPO-gg