diff --git a/config/boards/bananapim3.csc b/config/boards/bananapim3.csc
index 6efd8eab70..be931002c9 100644
--- a/config/boards/bananapim3.csc
+++ b/config/boards/bananapim3.csc
@@ -7,7 +7,7 @@ MODULES_NEXT=""
 OVERLAY_PREFIX="sun8i-a83t"
 #
 KERNEL_TARGET="next,dev"
-CLI_TARGET=""
-DESKTOP_TARGET=""
+CLI_TARGET="stretch:next"
+DESKTOP_TARGET="stretch:next"
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""
diff --git a/config/boards/odroidc2.conf b/config/boards/odroidc2.conf
index 7ae3f227b6..423cf17a9b 100644
--- a/config/boards/odroidc2.conf
+++ b/config/boards/odroidc2.conf
@@ -9,8 +9,8 @@ MODULES="bonding"
 MODULES_NEXT=""
 #
 KERNEL_TARGET="default,next,dev"
-CLI_TARGET=""
-DESKTOP_TARGET=""
+CLI_TARGET="stretch:default,next"
+DESKTOP_TARGET="stretch:default,next"
 #
-CLI_BETA_TARGET="bionic:dev"
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
diff --git a/config/boards/orangepiprime.conf b/config/boards/orangepiprime.conf
index 0837fe373a..9946c539f7 100644
--- a/config/boards/orangepiprime.conf
+++ b/config/boards/orangepiprime.conf
@@ -8,8 +8,8 @@ CPUMIN="408000"
 CPUMAX="1296000"
 #
 KERNEL_TARGET="next,dev"
-CLI_TARGET="stretch,xenial:next"
-DESKTOP_TARGET="stretch,xenial:next"
+CLI_TARGET="stretch:next"
+DESKTOP_TARGET="stretch:next"
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
diff --git a/lib/configuration.sh b/lib/configuration.sh
index 0b1b5d9ea6..bb2b78248b 100644
--- a/lib/configuration.sh
+++ b/lib/configuration.sh
@@ -10,7 +10,7 @@
 # common options
 # daily beta build contains date in subrevision
 if [[ $BETA == yes && -z $SUBREVISION ]]; then SUBREVISION="."$(date --date="tomorrow" +"%y%m%d"); fi
-REVISION="5.53$SUBREVISION" # all boards have same revision
+REVISION="5.54$SUBREVISION" # all boards have same revision
 ROOTPWD="1234" # Must be changed @first login
 MAINTAINER="Igor Pecovnik" # deb signature
 MAINTAINERMAIL="igor.pecovnik@****l.com" # deb signature