diff --git a/.templates/nodered/Dockerfile.template b/.templates/nodered/Dockerfile.template
index 556e7d63..8b782c75 100755
--- a/.templates/nodered/Dockerfile.template
+++ b/.templates/nodered/Dockerfile.template
@@ -6,20 +6,16 @@ FROM nodered/node-red:${DOCKERHUB_TAG}
 
 # reference argument - omitted defaults to null
 ARG EXTRA_PACKAGES
-ENV EXTRA_PACKAGES=${EXTRA_PACKAGES}
 
 # default user is node-red - need to be root to install packages
 USER root
 
 # install packages
-RUN apk update && apk add --no-cache eudev-dev ${EXTRA_PACKAGES}
+RUN apk add --no-cache eudev-dev ${EXTRA_PACKAGES}
 
 # switch back to default user
 USER node-red
 
-# variable not needed inside running container
-ENV EXTRA_PACKAGES=
-
 # add-on nodes follow
 
 %run npm install modules list%
diff --git a/.templates/nodered/addons.yml b/.templates/nodered/addons.yml
index e4457d31..e7657e01 100644
--- a/.templates/nodered/addons.yml
+++ b/.templates/nodered/addons.yml
@@ -8,7 +8,6 @@ addons:
     - "node-red-node-pi-gpiod"
     - "node-red-contrib-influxdb"
     - "node-red-contrib-boolean-logic"
-    - "node-red-node-rbe"
     - "node-red-configurable-ping"
     - "node-red-dashboard"
   default_off:
@@ -48,8 +47,13 @@ addons:
     - "node-red-contrib-generic-ble"
     - "node-red-contrib-zigbee2mqtt"
     - "node-red-contrib-vcgencmd"
-    - "node-red-contrib-themes/midnight-red"
+    - "@node-red-contrib-themes/theme-collection"
     - "node-red-contrib-tf-function"
     - "node-red-contrib-tf-model"
     - "node-red-contrib-post-object-detection"
-    - "node-red-contrib-bert-tokenizer"
\ No newline at end of file
+    - "node-red-contrib-bert-tokenizer"
+    - "node-red-node-tail"
+    - "node-red-contrib-boolean-logic-ultimate"
+    - "node-red-contrib-chartjs"
+    - "node-red-contrib-md5"
+    - "node-red-contrib-pushsafer"