diff --git a/compile_pkgs b/compile_pkgs
index e636f486031e69ecb0c4a2b6319aed5410de1240..08f6fb8fbef8695407e2fb78d80ab17961950296 100755
--- a/compile_pkgs
+++ b/compile_pkgs
@@ -14,6 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+shopt -s nullglob
 
 # Step list that is run when no commands are specified
 DEFAULT_STEPS=( "prepare" "compile" "sign" "store_hash" "pkgsrepo" "stats" "gen_junit" )
@@ -189,6 +190,25 @@ configure() {
 		echo "CONFIG_VERSION_CODE=\"$(_git_remote_hash)\""
 	} >> .config
 	_make defconfig diffconfig
+
+	# Verify config
+	for config in "${src_dir}/configs/common"/* "${src_dir}/configs/${TARGET_BOARD}"/*; do
+		 while IFS="=" read -r name value; do
+			 [ -z "$value" ] && continue
+			 [ "${value:0:1}" = "#" ] && continue
+			 if [ "$value" = "n" ]; then
+				 # No options can be ommited in the result so instead check it
+				 # they are not enabled by any chance.
+				 if grep -qE "^$name=y" ./.config; then
+					 die "Config option that is forced to 'n' is set to 'y': $name=$value"
+				 fi
+			else
+				 if ! grep -qE "^$name=$value$" ./.config; then
+					 die "Config option is not present in generated config: $name=$value"
+				 fi
+			 fi
+		done < "$config"
+	done
 }
 
 available_commands+=( ["update_mirror"]="Updates all local mirrors" )
diff --git a/configs/common/branding b/configs/common/branding
index 5c37f5bac628d4ea9a824e677ab731d15b0ee2c9..e4a7878a617b963e391a453df043e90823edaa15 100644
--- a/configs/common/branding
+++ b/configs/common/branding
@@ -4,7 +4,6 @@ CONFIG_VERSIONOPT=y
 CONFIG_VERSION_MANUFACTURER="CZ.NIC"
 CONFIG_VERSION_MANUFACTURER_URL="https://www.turris.cz/"
 CONFIG_VERSION_DIST="TurrisOS"
-CONFIG_VERSION_REPO="https://repo.turris.cz/"
 CONFIG_VERSION_HOME_URL="https://www.turris.cz/"
 CONFIG_VERSION_BUG_URL="https://gitlab.labs.nic.cz/groups/turris/-/issues/"
 CONFIG_VERSION_SUPPORT_URL="https://www.turris.cz/support/"
diff --git a/configs/common/busybox b/configs/common/busybox
index c175e6143f6bd4a4e208a2810130975680396d6d..560155c0795dc87ee47573b5de1e2c95cc5df9a6 100644
--- a/configs/common/busybox
+++ b/configs/common/busybox
@@ -1,6 +1,5 @@
 # Enable most of the applets available
 CONFIG_BUSYBOX_CUSTOM=y
-CONFIG_BUSYBOX_DEFAULT_CROND=n
 CONFIG_BUSYBOX_CONFIG_CRONTAB=n
 CONFIG_BUSYBOX_CONFIG_CROND=n
 CONFIG_BUSYBOX_CONFIG_SYSLOGD=n
@@ -36,7 +35,6 @@ CONFIG_BUSYBOX_CONFIG_USE_BB_CRYPT_SHA=y
 CONFIG_BUSYBOX_CONFIG_EJECT=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_EJECT_SCSI=y
 CONFIG_BUSYBOX_CONFIG_COMM=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP=y
 CONFIG_BUSYBOX_CONFIG_WATCHDOG=y
 CONFIG_BUSYBOX_CONFIG_DIFF=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
diff --git a/configs/common/essential_packages b/configs/common/essential_packages
index 1e913f01dca80a2cb579672658157140d0aa4634..84aab92cf20d971bf2873ba9eec1adb8b42ff707 100644
--- a/configs/common/essential_packages
+++ b/configs/common/essential_packages
@@ -5,17 +5,10 @@ CONFIG_PACKAGE_cznic-repo-keys-test=y
 CONFIG_PACKAGE_c-rehash=y
 CONFIG_PACKAGE_cert-backup=y
 CONFIG_PACKAGE_create_notification=y
-CONFIG_PACKAGE_oneshot=y
-CONFIG_PACKAGE_thermometer=y
-CONFIG_PACKAGE_nethist=y
-CONFIG_PACKAGE_server-uplink=y
 CONFIG_PACKAGE_update_mac=y
 CONFIG_PACKAGE_libatsha204=y
-CONFIG_PACKAGE_user_notify=y
 CONFIG_PACKAGE_watchdog_adjust=y
-CONFIG_PACKAGE_userspace_time_sync=y
 CONFIG_PACKAGE_start-indicator=y
-CONFIG_PACKAGE_vixie-cron=y
 
 # Turris packages
 CONFIG_PACKAGE_schnapps=y
@@ -23,18 +16,9 @@ CONFIG_PACKAGE_sentinel-certgen=y
 CONFIG_PACKAGE_dnssec-rootkey=y
 CONFIG_PACKAGE_resolver-conf=y
 CONFIG_PACKAGE_turris-utils=y
-CONFIG_PACKAGE_turris-maintain=y
 CONFIG_PACKAGE_turris-webapps=y
 CONFIG_PACKAGE_turris-version=y
 
-# Foris packages
-CONFIG_PACKAGE_foris=y
-CONFIG_PACKAGE_foris-client=y
-CONFIG_PACKAGE_foris-controller=y
-CONFIG_PACKAGE_foris-diagnostics-plugin=y
-CONFIG_PACKAGE_foris-l10n-cs=y
-CONFIG_PACKAGE_foris-ws=y
-
 # Updater packages
 CONFIG_PACKAGE_updater-ng=y
 CONFIG_PACKAGE_updater-supervisor=y
@@ -74,7 +58,6 @@ CONFIG_PACKAGE_kmod-ledtrig-heartbeat=y
 # LuCI
 CONFIG_PACKAGE_luci-base=y
 CONFIG_PACKAGE_luci=y
-CONFIG_PACKAGE_luci-lighttpd=y
 CONFIG_PACKAGE_luci-mod-admin-full=y
 CONFIG_PACKAGE_luci-mod-rpc=y
 CONFIG_PACKAGE_luci-app-firewall=y
@@ -91,15 +74,6 @@ CONFIG_PACKAGE_openssh-moduli=y
 CONFIG_PACKAGE_openssh-server=y
 CONFIG_PACKAGE_openssh-sftp-server=y
 
-# Lighttpd packages
-CONFIG_PACKAGE_lighttpd=y
-CONFIG_PACKAGE_lighttpd-luci=y
-CONFIG_PACKAGE_lighttpd-https-cert=y
-CONFIG_PACKAGE_lighttpd-mod-fastcgi=y
-CONFIG_PACKAGE_lighttpd-mod-openssl=y
-CONFIG_PACKAGE_lighttpd-mod-proxy=y
-CONFIG_PACKAGE_lighttpd-mod-redirect=y
-
 # Wireless packages
 CONFIG_PACKAGE_hostapd-common=y
 CONFIG_PACKAGE_iw-full=y
diff --git a/configs/mox/base b/configs/mox/base
index 0b833538b976eec6f2a9b9bd18cf3d905d5a094a..f903a3dd92561e9055bda1ea2d0bf3e22fa53721 100644
--- a/configs/mox/base
+++ b/configs/mox/base
@@ -1,4 +1,3 @@
 CONFIG_TARGET_mvebu=y
 CONFIG_TARGET_mvebu_cortexa53=y
 CONFIG_TARGET_mvebu_cortexa53_DEVICE_cznic-mox=y
-CONFIG_DEFAULT_TARGET_OPTIMIZATION="-O2 -pipe -mcpu=cortex-a53"
diff --git a/configs/omnia/base b/configs/omnia/base
index 4726bdf18537573dcdf2667e4c64d4dab485a615..0c74250edab2f6cdf606cb38e98e1c663c30fd0e 100644
--- a/configs/omnia/base
+++ b/configs/omnia/base
@@ -1,5 +1,3 @@
 CONFIG_TARGET_mvebu=y
 CONFIG_TARGET_mvebu_cortexa9=y
 CONFIG_TARGET_mvebu_cortexa9_DEVICE_cznic_turris-omnia=y
-CONFIG_DEFAULT_TARGET_OPTIMIZATION="-O2 -pipe -mcpu=cortex-a9 -mfpu=vfpv3-d16"
-CONFIG_CPU_TYPE="cortex-a9+vfpv3"
diff --git a/configs/turris1x/base b/configs/turris1x/base
index 75f63235524d190b7220555f087388f61b068186..2f28ed093fa72d44011001e76c6b877897372f55 100644
--- a/configs/turris1x/base
+++ b/configs/turris1x/base
@@ -1,5 +1,4 @@
 CONFIG_TARGET_mpc85xx=y
 CONFIG_TARGET_mpc85xx_p2020=y
 CONFIG_TARGET_mpc85xx_p2020_DEVICE_turris1x=y
-CONFIG_DEFAULT_TARGET_OPTIMIZATION="-O2 -pipe -mcpu=8540"
 CONFIG_SOFT_FLOAT=y