diff --git a/calamares/modules/netinstall.conf b/calamares/modules/netinstall.conf
new file mode 100644
index 0000000..8a63235
--- /dev/null
+++ b/calamares/modules/netinstall.conf
@@ -0,0 +1,12 @@
+groupsUrl:
+    - file:///etc/calamares/modules/netinstall-applications.yaml
+
+required: false
+
+label:
+    sidebar: "Applications"
+    sidebar[nl]: "Applicaties"
+    sidebar[ja]: "アプリケーション"
+    title: "Applications"
+    title[nl]: "Applicaties"
+    title[ja]: "アプリケーション"
diff --git a/calamares/modules/netinstall.yaml b/calamares/modules/netinstall.yaml
new file mode 100644
index 0000000..43739a9
--- /dev/null
+++ b/calamares/modules/netinstall.yaml
@@ -0,0 +1,172 @@
+- name: "Accessories"
+  description: "Accessories"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - featherpad
+    - file-roller
+    - flameshot
+    - galculator
+    - gnome-disk-utility
+    - keepassxc
+    - liferea
+    - mcomix
+    - mate-calc
+    - mediainfo-gui
+    - mintstick
+    - mousepad
+    - neovim
+    - qtpass
+    - qualculate
+    - waypipe
+    - wayvnc
+- name: "Development"
+  description: "Software for developers"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - apostrophe
+    - arduino
+    - bluefish
+    - emacs
+    - geany
+    - ghex
+    - git-cola
+    - gnome-builder
+    - kate
+    - kdevelop
+    - kicad
+    - meld
+    - micro
+    - notepadqq
+    - qtcreator
+- name: "Games"
+  description: "Game clietns, emulators, etc"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - dolphin-emu
+    - dosbox
+    - gamescope
+    - lutris
+    - mame
+    - mgba-qt
+    - mupen64plus-qt
+    - nestopia
+    - protontricks
+    - retroarch
+    - steam
+    - stella
+    - yuzu
+- name: "Graphics"
+  description: "Graphics software"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - blender
+    - darktable
+    - eom
+    - gimp
+    - inkscape
+    - krita
+    - lximage-qt
+    - mypaint
+    - rawtherapee
+    - ristretto
+    - simple-scan
+- name: "Internet"
+  description: "Web browsers, mail clietns, torrent clietns, etc"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - chromium
+    - dino
+    - epiphany-browser
+    - falkon
+    - filezilla
+    - gajim
+    - geary
+    - nheko
+    - telegram-desktop
+    - thunderbird
+    - transmission-gtk
+    - quassel
+    - quaternion
+    - qbittorrent
+    - qutebrowser
+- name: "Multimedia"
+  description: "Multimedia software (players, audio libraries, etc)"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - audacious
+    - audacity
+    - cantata
+    - celluloid
+    - cheese
+    - clementine
+    - easyeffects
+    - elisa
+    - handbrake
+    - kdenlive
+    - mpv
+    - musikcube
+    - obs-studio
+    - pipewire-jack
+    - sayonara
+    - shotcut
+    - strawberry
+    - vlc
+    - webcamoid
+- name: "Office"
+  description: "Document viewers, office suite"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - libreoffice
+    - libreoffice-writer
+    - libreoffice-impress
+    - libreoffice-calc
+    - libreoffice-base
+    - libreoffice-draw
+    - libreoffice-math
+    - okular
+    - qpdfview
+    - zathura
+- name: "System"
+  description: "Various system software and utils"
+  critical: false
+  hidden: false
+  selected: false
+  expanded: false
+  packages:
+    - cpu-x
+    - drm-info
+    - firewalld
+    - firetools
+    - gnome-packagekit
+    - gsmartcontrol
+    - inxi
+    - kitty
+    - mate-terminal
+    - opensnitch
+    - sakura
+    - system-config-printer
+    - terminator
+    - timeshift
+    - virt-manager
+    - xfce4-terminal
diff --git a/calamares/modules/packages.conf b/calamares/modules/packages.conf
index a77083c..b85e1b1 100644
--- a/calamares/modules/packages.conf
+++ b/calamares/modules/packages.conf
@@ -1,5 +1,9 @@
 backend: apt
 
+skip_if_no_internet: false
+update_db: true
+update_system: false
+
 operations:
   - remove:
       - 'live-boot'
diff --git a/calamares/settings.conf b/calamares/settings.conf
index f78e27e..ce4d9ff 100644
--- a/calamares/settings.conf
+++ b/calamares/settings.conf
@@ -48,6 +48,7 @@ sequence:
   - welcome
   - locale
   - keyboard
+  - netinstall
   - partition
   - users
   - summary