diff --git a/files/usr/bin/system-flatpak-setup b/files/usr/bin/system-flatpak-setup
index fb13971..a6176c6 100755
--- a/files/usr/bin/system-flatpak-setup
+++ b/files/usr/bin/system-flatpak-setup
@@ -50,20 +50,12 @@ REMOVE_LIST=$(cat /etc/flatpak/system/remove)
 
 # Install flatpaks in list
 if [[ -n $INSTALL_LIST ]]; then
-  for flatpak in $INSTALL_LIST; do
-    if grep -qvz $flatpak <<< $FLATPAK_LIST; then
-      flatpak install --system --noninteractive $REPO_NAME $flatpak
-    fi
-  done
+    flatpak install --system --noninteractive $REPO_NAME ${INSTALL_LIST[@]}
 fi
 
 # Remove flatpaks in list
 if [[ -n $REMOVE_LIST ]]; then
-  for flatpak in $REMOVE_LIST; do
-    if grep -qz $flatpak <<< $FLATPAK_LIST; then
-      flatpak remove --system --noninteractive $flatpak
-    fi
-  done
+    flatpak remove --system --noninteractive ${REMOVE_LIST[@]}
 fi
 
 # Prevent future executions
diff --git a/files/usr/bin/user-flatpak-setup b/files/usr/bin/user-flatpak-setup
index 3d9954e..3084df1 100755
--- a/files/usr/bin/user-flatpak-setup
+++ b/files/usr/bin/user-flatpak-setup
@@ -41,20 +41,12 @@ REMOVE_LIST=$(cat /etc/flatpak/user/remove)
 
 # Install flatpaks in list
 if [[ -n $INSTALL_LIST ]]; then
-  for flatpak in $INSTALL_LIST; do
-    if grep -qvz $flatpak <<< $FLATPAK_LIST; then
-      flatpak install --user --noninteractive $REPO_NAME $flatpak
-    fi
-  done
+    flatpak install --user --noninteractive $REPO_NAME ${INSTALL_LIST[@]}
 fi
 
 # Remove flatpaks in list
 if [[ -n $REMOVE_LIST ]]; then
-  for flatpak in $REMOVE_LIST; do
-    if grep -qz $flatpak <<< $FLATPAK_LIST; then
-      flatpak remove --user --noninteractive $flatpak
-    fi
-  done
+    flatpak remove --user --noninteractive $flatpak ${REMOVE_LIST[@]}
 fi
 
 # Prevent future executions