diff --git a/scripts/image b/scripts/image
index 4bde492ffd..e87e59224a 100755
--- a/scripts/image
+++ b/scripts/image
@@ -372,6 +372,9 @@ fi
           $SCRIPTS/mkimage
       fi
 
+      # cleanup release dir
+      rm -rf $RELEASE_DIR
+
     # create WeTek Play (Amlogic) ZIP update and auto-install packages if requested
       if [ "$1" = "amlpkg" ]; then
         echo "Creating Amlogic ZIP update package"
@@ -532,7 +535,8 @@ fi
 
         # create release tarball
           tar cf $TARGET_IMG/${IMAGE_NAME}-$1.tar -C $TARGET ${IMAGE_NAME}-$1
+
+        # cleanup noobs dir
+          rm -rf $RELEASE_DIR
       fi
-    # cleanup release dir
-      rm -rf $RELEASE_DIR
   fi