diff --git a/helpers/DATA/budgie-desktop-environment/ecne.jpg b/helpers/DATA/budgie-desktop-environment/ecne.jpg
deleted file mode 100644
index 1310cde..0000000
Binary files a/helpers/DATA/budgie-desktop-environment/ecne.jpg and /dev/null differ
diff --git a/helpers/DATA/ubuntukylin-wallpapers/aramo.jpg b/helpers/DATA/ubuntukylin-wallpapers/aramo.jpg
deleted file mode 100644
index 1310cde..0000000
Binary files a/helpers/DATA/ubuntukylin-wallpapers/aramo.jpg and /dev/null differ
diff --git a/helpers/make-budgie-desktop-environment b/helpers/make-budgie-desktop-environment
index 13ffee0..e3e9abc 100644
--- a/helpers/make-budgie-desktop-environment
+++ b/helpers/make-budgie-desktop-environment
@@ -24,13 +24,16 @@ VERSION=2
 
 #Set default trisquel wallpaper
 BUDGIE_WALLP="budgie-codename.png"
-TRISQUEL_WALLP="$CODENAME.jpg"
+TRISQUEL_WALLP="$(find DATA/trisquel-wallpapers/ -name $CODENAME.*|xargs basename)"
 
 grep -lr "$BUDGIE_WALLP" | xargs -r sed -i "s|$BUDGIE_WALLP|$TRISQUEL_WALLP|g"
 
 #menu-icon
 cp $DATA/logo-trisquel.svg distrologo/trisquel-logo.svg
-cp $DATA/$CODENAME.jpg codename-wallpapers/
+
+# Make sure to review helper on the designed stage prior to release, so it uses
+# right artwork when released.
+cp $(find DATA/trisquel-wallpapers/ -name $CODENAME.*) codename-wallpapers/
 rm codename-wallpapers/budgie-codename.png
 
 #Tweak default handlers
diff --git a/helpers/make-ubuntukylin-wallpapers b/helpers/make-ubuntukylin-wallpapers
index e6eeb67..4724122 100644
--- a/helpers/make-ubuntukylin-wallpapers
+++ b/helpers/make-ubuntukylin-wallpapers
@@ -27,9 +27,9 @@ VERSION=3
 sed -i "s|background=.*|background=\"/usr/share/backgrounds/$CODENAME.jpg\"|" 30_ubuntukylin-wallpapers.gschema.override
 sed -i "s|picture-uri=.*|picture-uri=\'file:///usr/share/backgrounds/$CODENAME.jpg\'|" 30_ubuntukylin-wallpapers.gschema.override
 
-# Copy final artwork from trisquel-packages/$VERSION/trisquel-wallpapers repository.
-# Make sure to force helper fail on release update, so it's fixed once the new artwork is released.
-cp $DATA/$CODENAME.jpg warty-final-ubuntukylin.jpg
+# Make sure to review helper on the designed stage prior to release, so it uses
+# right artwork when released.
+cp $(find DATA/trisquel-wallpapers/ -name $CODENAME.*) warty-final-ubuntukylin.jpg
 
 # Add current release wallpaper to any possible xml release kylin-wallpaper file.
 for i in $(find -name \*.xml.in)