diff --git a/src/freedombone-image b/src/freedombone-image
index a9ac6f35a10665622f76cf47d2143fe07cdceec3..0d86232befa681fde586eaaff1a2549f2032e320 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -71,7 +71,7 @@ MAKEFILE=${PROJECT_NAME}-image-makefile
 IMAGE_SIZE=7.9G
 IMAGE_SIZE_SPECIFIED=
 IMAGE_NAME='full'
-
+BUILD_WITHIN_CI='no'
 USERNAME="$USER"
 PASSWORD=
 
@@ -343,6 +343,10 @@ do
             shift
             BUILD_LOG="$1"
             ;;
+        --continuous-integration)
+            shift
+            BUILD_WITHIN_CI='yes'
+            ;;
         -u|--user|--username)
             shift
             USERNAME="$1"
@@ -652,7 +656,8 @@ make "$IMAGE_TYPE" \
      EXTERNAL_DRIVE="$EXTERNAL_DRIVE" \
      CONTINUOUS_INTEGRATION="$CONTINUOUS_INTEGRATION" \
      LOCAL_NAME="$LOCAL_NAME" \
-     BUILD_LOG="$BUILD_LOG"
+     BUILD_LOG="$BUILD_LOG" \
+     BUILD_WITHIN_CI="$BUILD_WITHIN_CI"
 
 # shellcheck disable=SC2181
 if [ ! "$?" = "0" ]; then
diff --git a/src/freedombone-image-make b/src/freedombone-image-make
index f42ab31ebd79259eeedb65daf1703d3e962d1249..7fb2805f1722a3ae416eba1e1b164d9d90772ff1 100755
--- a/src/freedombone-image-make
+++ b/src/freedombone-image-make
@@ -80,6 +80,7 @@ export LOCAL_NAME
 export EXTERNAL_DRIVE
 export CONTINUOUS_INTEGRATION
 export BUILD_LOG
+export BUILD_WITHIN_CI
 
 # Locate vmdebootstrap program fetched in Makefile
 basedir=`pwd`
@@ -275,6 +276,12 @@ if [ ! "$BUILD_LOG" ]; then
     BUILD_LOG="$(dirname "$IMAGE")/${PROJECT_NAME}.log"
 fi
 
+# append continuous integration option
+if [[ "$BUILD_WITHIN_CI" == 'y'* ]]; then
+    extra_opts="$extra_opts\
+ --continuous-integration"
+fi
+
 echo $"starting $VMDEBOOTSTRAP"
 
 # Run vmdebootstrap script to create image