Rename docker image names in ci branches from vicamo to i386

15 files changed, 54 insertions, 54 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 109a8936a..cfb7ba73c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,7 +66,7 @@ gcc-8-i386:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-8 g++-8 
@@ -84,7 +84,7 @@ gcc-7-i386:
   - ./tools/ci/jobs/gcc7.sh
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-7 g++-7 
diff --git a/tools/ci/branches/ci_clang3x/.gitlab-ci.yml b/tools/ci/branches/ci_clang3x/.gitlab-ci.yml
index 7656fdd45..c3c8fb5ef 100644
--- a/tools/ci/branches/ci_clang3x/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_clang3x/.gitlab-ci.yml
@@ -113,7 +113,7 @@ clang-3.4_i386:
   script:
   - ./tools/ci/jobs/clang34.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:jessie-i386
+  image: i386/debian:jessie
   <<: *job-push
   variables:
     PACKAGES: clang-3.4 libc++-dev 
@@ -207,7 +207,7 @@ clang-3.7_i386:
   script:
   - ./tools/ci/jobs/clang37.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/ubuntu:xenial-i386
+  image: i386/ubuntu:xenial
   <<: *job-push
   variables:
     PACKAGES: clang-3.7 libc++-dev 
@@ -239,7 +239,7 @@ clang-3.8_i386:
   script:
   - ./tools/ci/jobs/clang38.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/ubuntu:xenial-i386
+  image: i386/ubuntu:xenial
   <<: *job-push
   variables:
     PACKAGES: clang-3.8 libc++-dev libc++abi-dev 
@@ -269,7 +269,7 @@ clang-3.8_i386:
   script:
   - ./tools/ci/jobs/clang39.sh_c++11.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: clang-3.9 libc++-dev libc++abi-dev 
diff --git a/tools/ci/branches/ci_clang6/.gitlab-ci.yml b/tools/ci/branches/ci_clang6/.gitlab-ci.yml
index 87928a726..4e00d3b01 100644
--- a/tools/ci/branches/ci_clang6/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_clang6/.gitlab-ci.yml
@@ -35,7 +35,7 @@ clang-6.0_tests_i386:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev 
               make autoconf automake autopoint gettext 
@@ -64,7 +64,7 @@ clang-6.0_tests_sdl2_i386:
   script:
   - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev 
               make autoconf automake autopoint gettext 
@@ -97,7 +97,7 @@ clang-6.0_i386:
   - ./tools/ci/jobs/clang60.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev 
               make autoconf automake autopoint gettext 
@@ -128,7 +128,7 @@ clang-6.0_sdl2_i386:
   - ./tools/ci/jobs/clang60.sh --with-sdl2
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc g++ clang-6.0 libc++-dev libc++abi-dev libclang-6.0-dev 
               make autoconf automake autopoint gettext 
diff --git a/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml b/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml
index ee9f61205..6a9f84135 100644
--- a/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml
@@ -38,7 +38,7 @@ gcc-snapshot_i386:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gccsnapshot.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-snapshot 
@@ -69,7 +69,7 @@ gcc-snapshot_sdl2_i386:
   script:
   - ./tools/ci/jobs/gccsnapshot_sdl2.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-snapshot 
diff --git a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml
index f9bab4dbf..d5e2872df 100644
--- a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml
@@ -35,7 +35,7 @@ gcc-4.9_sanitize_tests_i386:
   script:
   - ./tools/ci/jobs/gcc49_sanitize_tests.sh
   - ldd ./src/manaplustests | grep "libasan"
-  image: vicamo/debian:jessie-i386
+  image: i386/debian:jessie
   <<: *job-push
   variables:
     PACKAGES: gcc-4.9 g++-4.9 
@@ -66,7 +66,7 @@ gcc-4.9_sanitize_i386:
   script:
   - ./tools/ci/jobs/gcc49_sanitize.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:jessie-i386
+  image: i386/debian:jessie
   <<: *job-push
   variables:
     PACKAGES: gcc-4.9 g++-4.9 
@@ -151,7 +151,7 @@ gcc-4.9_i386:
   script:
   - ./tools/ci/jobs/gcc49.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:jessie-i386
+  image: i386/debian:jessie
   <<: *job-push
   variables:
     PACKAGES: gcc-4.9 g++-4.9 
diff --git a/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml b/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml
index 14bb9425e..c657d6e08 100644
--- a/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml
@@ -224,7 +224,7 @@ gcc-4.8_i386:
   - ./tools/ci/jobs/gcc48.sh
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
-  image: vicamo/debian:jessie-i386
+  image: i386/debian:jessie
   <<: *job-push
   variables:
     PACKAGES: git gcc-4.8 g++-4.8 
@@ -256,7 +256,7 @@ gcc-4.8_sdl2_i386:
   - ./tools/ci/jobs/gcc48.sh --with-sdl2
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
-  image: vicamo/debian:jessie-i386
+  image: i386/debian:jessie
   <<: *job-push
   variables:
     PACKAGES: git gcc-4.8 g++-4.8 
diff --git a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml
index 649809752..b8b7737ec 100644
--- a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml
@@ -22,7 +22,7 @@ gcc-7-i386:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-7 g++-7 
@@ -66,7 +66,7 @@ gcc-7_sdl2_i386:
   - ./tools/ci/jobs/gcc7.sh --with-sdl2
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc-7 g++-7 
               make autoconf automake autopoint gettext 
@@ -115,7 +115,7 @@ gcc-7_sanitize:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_sanitize.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-7 g++-7 
@@ -162,7 +162,7 @@ gcc-7_lto_i386:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_lto.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-7 g++-7 
@@ -181,7 +181,7 @@ gcc-7_default_i386:
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     LOGFILE: gcc7.log
     CC: gcc-7
diff --git a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
index bb776033a..65659af71 100644
--- a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
@@ -38,7 +38,7 @@ gcc-7_doctest_tests_i386:
   script:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-7 g++-7 
@@ -119,7 +119,7 @@ gcc-7_tests_lto_i386:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     POST_CXXFLAGS: "-ffast-math -O9 -flto -fwhole-program -funswitch-loops"
     PACKAGES: gcc-7 g++-7 
@@ -135,7 +135,7 @@ gcc-7_tests_i386:
   script:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-7 g++-7 
@@ -181,7 +181,7 @@ gcc-7_sdl2_tests_i386:
   stage: build
   script:
   - ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-7 g++-7 
@@ -218,7 +218,7 @@ gcc-7_sdl2_tests_i386:
   - echo test valgrind
   - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log
   - grep "invalid" logs/valg.log && exit 1 || true
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-7 g++-7 
@@ -301,7 +301,7 @@ gcc-7_separate_doctest_i386:
   - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd
   - ./tools/ci/scripts/separateunittests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc-7 g++-7 
               make autoconf automake autopoint gettext 
@@ -317,7 +317,7 @@ gcc-7_separate_doctest_sdl2_i386:
   - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2
   - ./tools/ci/scripts/separateunittests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc-7 g++-7 
               make autoconf automake autopoint gettext 
diff --git a/tools/ci/branches/ci_gcc8/.gitlab-ci.yml b/tools/ci/branches/ci_gcc8/.gitlab-ci.yml
index d8a5820d0..7854d92bf 100644
--- a/tools/ci/branches/ci_gcc8/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc8/.gitlab-ci.yml
@@ -35,7 +35,7 @@ gcc-8_sdl2_i386:
   - ./tools/ci/jobs/gcc8.sh --with-sdl2
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc-8 g++-8 
               make autoconf automake autopoint gettext 
@@ -113,7 +113,7 @@ gcc-8_lto_i386:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_lto.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-8 g++-8 
diff --git a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml
index 3fff80d6c..65c5b8be5 100644
--- a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml
@@ -57,7 +57,7 @@ gcc-8_doctest_tests_i386:
   script:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-8 g++-8 
@@ -138,7 +138,7 @@ gcc-8_tests_lto_i386:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     POST_CXXFLAGS: "-ffast-math -O9 -flto -fwhole-program -funswitch-loops"
     PACKAGES: gcc-8 g++-8 
@@ -154,7 +154,7 @@ gcc-8_tests_i386:
   script:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-8 g++-8 
@@ -200,7 +200,7 @@ gcc-8_sdl2_tests_i386:
   stage: build
   script:
   - ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-8 g++-8 
@@ -237,7 +237,7 @@ gcc-8_sdl2_tests_i386:
   - echo test valgrind
   - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log
   - grep "invalid" logs/valg.log && exit 1 || true
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-8 g++-8 
@@ -320,7 +320,7 @@ gcc-8_separate_doctest_i386:
   - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd
   - ./tools/ci/scripts/separateunittests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc-8 g++-8 
               make autoconf automake autopoint gettext 
@@ -336,7 +336,7 @@ gcc-8_separate_doctest_sdl2_i386:
   - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2
   - ./tools/ci/scripts/separateunittests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc-8 g++-8 
               make autoconf automake autopoint gettext 
diff --git a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml
index de558aba1..f826e8110 100644
--- a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml
@@ -21,7 +21,7 @@ gcc-8_tests_glibcdebug_i386:
   script:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-8 g++-8 
@@ -53,7 +53,7 @@ gcc-8_glibcdebug_i386:
   - ./tools/ci/jobs/gcc8.sh --enable-glibcdebug --without-dyecmd
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc-8 g++-8 
               make autoconf automake autopoint gettext 
@@ -80,7 +80,7 @@ gcc-8_glibcdebug_sdl2_i386:
   - ./tools/ci/jobs/gcc8.sh --with-sdl2 --enable-glibcdebug --without-dyecmd
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc-8 g++-8 
               make autoconf automake autopoint gettext 
diff --git a/tools/ci/branches/ci_main1/.gitlab-ci.yml b/tools/ci/branches/ci_main1/.gitlab-ci.yml
index 631bba20c..e15dac278 100644
--- a/tools/ci/branches/ci_main1/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_main1/.gitlab-ci.yml
@@ -23,7 +23,7 @@
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_sanitize.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-7 g++-7 
@@ -72,7 +72,7 @@ gcc-7_lto_i386:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_lto.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-7 g++-7 
@@ -180,7 +180,7 @@ gcc-8_default_i386:
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     LOGFILE: gcc8.log
     CC: gcc-8
@@ -201,7 +201,7 @@ gcc-8_openglerrors_i386:
   - ./tools/ci/jobs/gcc8.sh --enable-openglerrors
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc-8 g++-8 
               make autoconf automake autopoint gettext 
diff --git a/tools/ci/branches/ci_mse/.gitlab-ci.yml b/tools/ci/branches/ci_mse/.gitlab-ci.yml
index 8a5a8d585..a75fefb83 100644
--- a/tools/ci/branches/ci_mse/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_mse/.gitlab-ci.yml
@@ -21,7 +21,7 @@ gcc-7_tests_mse_i386:
   script:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-7 g++-7 
@@ -53,7 +53,7 @@ gcc-7_mse_i386:
   - ./tools/ci/jobs/gcc7.sh --enable-stldebug --without-dyecmd
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc-7 g++-7 
               make autoconf automake autopoint gettext 
@@ -80,7 +80,7 @@ gcc-7_mse_sdl2_i386:
   - ./tools/ci/jobs/gcc7.sh --with-sdl2 --enable-stldebug --without-dyecmd
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   variables:
     PACKAGES: gcc-7 g++-7 
               make autoconf automake autopoint gettext 
diff --git a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml
index 2ae175849..9b1431bcb 100644
--- a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml
@@ -36,7 +36,7 @@ gcc-8_pugixml_tests_i386:
   script:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-libxml=pugixml
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-8 g++-8 
@@ -67,7 +67,7 @@ gcc-8_pugixml_i386:
   - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --enable-libxml=pugixml
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-8 g++-8 
diff --git a/tools/ci/branches/master/.gitlab-ci.yml b/tools/ci/branches/master/.gitlab-ci.yml
index 7562e2003..1e7d01378 100644
--- a/tools/ci/branches/master/.gitlab-ci.yml
+++ b/tools/ci/branches/master/.gitlab-ci.yml
@@ -48,7 +48,7 @@ gcc-5_c++11_i386:
   script:
   - ./tools/ci/jobs/gcc5_c++11.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-5 g++-5 
@@ -64,7 +64,7 @@ gcc-6-i386:
   script:
   - ./tools/ci/jobs/gcc6.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-6 g++-6 
@@ -80,7 +80,7 @@ gcc-7-i386:
   script:
   - ./tools/ci/jobs/gcc7.sh
   - ./tools/ci/scripts/runtests.sh
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-7 g++-7 
@@ -285,7 +285,7 @@ gcc-5_h_all_i386:
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
-  image: vicamo/debian:sid-i386
+  image: i386/debian:unstable
   <<: *job-push
   variables:
     PACKAGES: gcc-5 g++-5