diff --git a/build_torcx_store b/build_torcx_store
index 1e9453f68c..6e45f62e0b 100755
--- a/build_torcx_store
+++ b/build_torcx_store
@@ -225,14 +225,14 @@ function torcx_package() {
 # swapping default package versions for different OS releases by reordering.
 DEFAULT_IMAGES=(
         =app-torcx/docker-1.12
-        =app-torcx/docker-17.12
+        =app-torcx/docker-18.01
 )
 
 # This list contains extra images which will be uploaded and included in the
 # generated manifest, but won't be included in the vendor store.
 EXTRA_IMAGES=(
 	=app-torcx/docker-17.03
-	=app-torcx/docker-17.09
+	=app-torcx/docker-17.12
 )
 
 mkdir -p "${BUILD_DIR}"