diff --git a/cassandra/Dockerfile b/cassandra/Dockerfile
index 6b7c145..4ca9656 100644
--- a/cassandra/Dockerfile
+++ b/cassandra/Dockerfile
@@ -15,7 +15,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=cassandra,python2-basic,which --no-scripts \
+    --bundles=cassandra,python2-basic,which --no-boot-update \
     && rm -rf /install_root/var/lib/swupd/*
 
 # For some Host OS configuration with redirect_dir on,
diff --git a/cgit/Dockerfile b/cgit/Dockerfile
index ebe9c11..daf7727 100644
--- a/cgit/Dockerfile
+++ b/cgit/Dockerfile
@@ -15,7 +15,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=sudo,curl,scm-server --no-scripts \
+    --bundles=sudo,curl,scm-server --no-boot-update \
     && rm -rf /install_root/var/lib/swupd/*
 
 # For some Host OS configuration with redirect_dir on,
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
index a14ea6c..85c4091 100644
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=elasticsearch --no-scripts
+    --bundles=elasticsearch --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/flink/Dockerfile b/flink/Dockerfile
index df23304..d11be9b 100644
--- a/flink/Dockerfile
+++ b/flink/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=os-core-update,apache-flink --no-scripts
+    --bundles=os-core-update,apache-flink --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/golang/Dockerfile b/golang/Dockerfile
index 8fa94e1..34d1827 100644
--- a/golang/Dockerfile
+++ b/golang/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=os-core-update,go-basic --no-scripts
+    --bundles=os-core-update,go-basic --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/haproxy/Dockerfile b/haproxy/Dockerfile
index 33f54f7..c7b74cb 100644
--- a/haproxy/Dockerfile
+++ b/haproxy/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=haproxy --no-scripts
+    --bundles=haproxy --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/httpd/Dockerfile b/httpd/Dockerfile
index 928e822..a57b447 100644
--- a/httpd/Dockerfile
+++ b/httpd/Dockerfile
@@ -15,7 +15,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=httpd --no-scripts \
+    --bundles=httpd --no-boot-update \
     && rm -rf /install_root/var/lib/swupd/*
 
 # For some Host OS configuration with redirect_dir on,
diff --git a/iperf/Dockerfile b/iperf/Dockerfile
index 2839ebf..d2c09c6 100644
--- a/iperf/Dockerfile
+++ b/iperf/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=iperf --no-scripts
+    --bundles=iperf --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
index b6d4cb7..41eb5ca 100644
--- a/mariadb/Dockerfile
+++ b/mariadb/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=mariadb --no-scripts \
+    --bundles=mariadb --no-boot-update \
     && rm -rf /install_root/var/lib/swupd/*
 
 # For some Host OS configuration with redirect_dir on,
diff --git a/memcached/Dockerfile b/memcached/Dockerfile
index 63bd9b4..d8a843d 100644
--- a/memcached/Dockerfile
+++ b/memcached/Dockerfile
@@ -15,7 +15,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=memcached --no-scripts \
+    --bundles=memcached --no-boot-update \
     && rm -rf /install_root/var/lib/swupd/*
 
 # For some Host OS configuration with redirect_dir on,
diff --git a/node/Dockerfile b/node/Dockerfile
index dda50bd..a67796a 100644
--- a/node/Dockerfile
+++ b/node/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=os-core-update,nodejs-basic --no-scripts
+    --bundles=os-core-update,nodejs-basic --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/openjdk/Dockerfile b/openjdk/Dockerfile
index 4f703cf..76fd45e 100644
--- a/openjdk/Dockerfile
+++ b/openjdk/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=os-core-update,java-runtime --no-scripts
+    --bundles=os-core-update,java-runtime --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/os-core/Dockerfile b/os-core/Dockerfile
index e9c82fb..8bcc35d 100644
--- a/os-core/Dockerfile
+++ b/os-core/Dockerfile
@@ -11,7 +11,7 @@ RUN source /usr/lib/os-release \
     && mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=os-core --no-scripts \
+    --bundles=os-core --no-boot-update \
     && rm -rf /install_root/var/lib/swupd/*
 
 FROM scratch
diff --git a/perl/Dockerfile b/perl/Dockerfile
index 99b9be3..cfd2f38 100644
--- a/perl/Dockerfile
+++ b/perl/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=os-core-update,perl-extras --no-scripts
+    --bundles=os-core-update,perl-extras --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index ec3c6c7..970cb47 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=os-core-update,php-basic,curl --no-scripts
+    --bundles=os-core-update,php-basic,curl --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/php/Dockerfile b/php/Dockerfile
index e4bfa4e..37beeac 100644
--- a/php/Dockerfile
+++ b/php/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=os-core-update,php-basic --no-scripts
+    --bundles=os-core-update,php-basic --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index 920a435..955176a 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=postgresql --no-scripts
+    --bundles=postgresql --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/python/Dockerfile b/python/Dockerfile
index 4363941..12d6b07 100644
--- a/python/Dockerfile
+++ b/python/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=os-core-update,python3-basic --no-scripts
+    --bundles=os-core-update,python3-basic --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/rabbitmq/Dockerfile b/rabbitmq/Dockerfile
index 8f91196..1e25b3c 100644
--- a/rabbitmq/Dockerfile
+++ b/rabbitmq/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=os-core-update,rabbitmq-server --no-scripts
+    --bundles=os-core-update,rabbitmq-server --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/redis/Dockerfile b/redis/Dockerfile
index 7d179e9..bd1e6e7 100644
--- a/redis/Dockerfile
+++ b/redis/Dockerfile
@@ -15,7 +15,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=redis-native,findutils --no-scripts \
+    --bundles=redis-native,findutils --no-boot-update \
     && rm -rf /install_root/var/lib/swupd/*
 
 # For some Host OS configuration with redirect_dir on,
diff --git a/ruby/Dockerfile b/ruby/Dockerfile
index 9d1115b..4a70dc4 100644
--- a/ruby/Dockerfile
+++ b/ruby/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=os-core-update,ruby-basic --no-scripts
+    --bundles=os-core-update,ruby-basic --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same
diff --git a/tensorflow/Dockerfile b/tensorflow/Dockerfile
index 46277df..0ecae11 100644
--- a/tensorflow/Dockerfile
+++ b/tensorflow/Dockerfile
@@ -17,7 +17,7 @@ RUN source /os-release && \
     mkdir /install_root \
     && swupd os-install -V ${VERSION_ID} \
     --path /install_root --statedir /swupd-state \
-    --bundles=os-core-update,machine-learning-tensorflow --no-scripts
+    --bundles=os-core-update,machine-learning-tensorflow --no-boot-update
 
 # For some Host OS configuration with redirect_dir on,
 # extra data are saved on the upper layer when the same