diff --git a/pkg/auditd/Makefile b/pkg/auditd/Makefile
index 170e09f0f..fcd516551 100644
--- a/pkg/auditd/Makefile
+++ b/pkg/auditd/Makefile
@@ -1,3 +1,3 @@
-include ../package.mk
-
 IMAGE?=auditd
+
+include ../package.mk
diff --git a/pkg/binfmt/Makefile b/pkg/binfmt/Makefile
index 7dc7bb840..c13402e1e 100644
--- a/pkg/binfmt/Makefile
+++ b/pkg/binfmt/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=binfmt
 DEPS=main.go $(wildcard etc/binmft.d/*)
+
+include ../package.mk
diff --git a/pkg/ca-certificates/Makefile b/pkg/ca-certificates/Makefile
index adf066a16..2b0c67f0c 100644
--- a/pkg/ca-certificates/Makefile
+++ b/pkg/ca-certificates/Makefile
@@ -1,3 +1,3 @@
-include ../package.mk
-
 IMAGE=ca-certificates
+
+include ../package.mk
diff --git a/pkg/containerd/Makefile b/pkg/containerd/Makefile
index 3363f4072..03b5ef9f0 100644
--- a/pkg/containerd/Makefile
+++ b/pkg/containerd/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=containerd
 NETWORK=1
+
+include ../package.mk
diff --git a/pkg/dhcpcd/Makefile b/pkg/dhcpcd/Makefile
index deb630d1a..1e648453e 100644
--- a/pkg/dhcpcd/Makefile
+++ b/pkg/dhcpcd/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=dhcpcd
 DEPS=dhcpcd.conf $(wildcard usr/lib/dhcpcd/dhcpcd-hooks/*)
+
+include ../package.mk
diff --git a/pkg/docker-ce/Makefile b/pkg/docker-ce/Makefile
index 59b105664..efd826209 100644
--- a/pkg/docker-ce/Makefile
+++ b/pkg/docker-ce/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=docker-ce
 NETWORK=1
+
+include ../package.mk
diff --git a/pkg/format/Makefile b/pkg/format/Makefile
index 136df48f5..b7a136dea 100644
--- a/pkg/format/Makefile
+++ b/pkg/format/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=format
 DEPS=format.sh
+
+include ../package.mk
diff --git a/pkg/getty/Makefile b/pkg/getty/Makefile
index b0486239c..e7ba709a5 100644
--- a/pkg/getty/Makefile
+++ b/pkg/getty/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=getty
 DEPS=usr/bin/rungetty.sh $(wildcard etc/*) $(wildcard etc/init.d/*)
+
+include ../package.mk
diff --git a/pkg/init/Makefile b/pkg/init/Makefile
index 9f1469350..cf537b036 100644
--- a/pkg/init/Makefile
+++ b/pkg/init/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=init
 DEPS=init usermode-helper.c $(wildcard etc/*) $(wildcard etc/init.d/*)
+
+include ../package.mk
diff --git a/pkg/metadata/Makefile b/pkg/metadata/Makefile
index 12d180d42..369218447 100644
--- a/pkg/metadata/Makefile
+++ b/pkg/metadata/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=metadata
 DEPS=$(wildcard *.go)
+
+include ../package.mk
diff --git a/pkg/mkimage/Makefile b/pkg/mkimage/Makefile
index 3d51151d9..eb2157d0e 100644
--- a/pkg/mkimage/Makefile
+++ b/pkg/mkimage/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=mkimage
 DEPS=mkimage.sh
+
+include ../package.mk
diff --git a/pkg/mount/Makefile b/pkg/mount/Makefile
index 1f721de94..2deb1dbf3 100644
--- a/pkg/mount/Makefile
+++ b/pkg/mount/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=mount
 DEPS=mount.sh
+
+include ../package.mk
diff --git a/pkg/node_exporter/Makefile b/pkg/node_exporter/Makefile
index 60e928077..f1f347b5d 100644
--- a/pkg/node_exporter/Makefile
+++ b/pkg/node_exporter/Makefile
@@ -1,3 +1,3 @@
-include ../package.mk
-
 IMAGE=node_exporter
+
+include ../package.mk
diff --git a/pkg/open-vm-tools/Makefile b/pkg/open-vm-tools/Makefile
index a67cd6a5d..e8b459a76 100644
--- a/pkg/open-vm-tools/Makefile
+++ b/pkg/open-vm-tools/Makefile
@@ -1,3 +1,3 @@
-include ../package.mk
-
 IMAGE=open-vm-tools
+
+include ../package.mk
diff --git a/pkg/openntpd/Makefile b/pkg/openntpd/Makefile
index 23be6b1b3..8cfe5e8e4 100644
--- a/pkg/openntpd/Makefile
+++ b/pkg/openntpd/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=openntpd
 DEPS=etc/ntpd.conf
+
+include ../package.mk
diff --git a/pkg/package.mk b/pkg/package.mk
index 08a2d262b..85dedf645 100644
--- a/pkg/package.mk
+++ b/pkg/package.mk
@@ -21,7 +21,7 @@ endif
 # Get a release tag, if present
 RELEASE=$(shell git tag -l --points-at HEAD)
 
-ifndef $(NETWORK)
+ifdef NETWORK
 NET_OPT=
 else
 NET_OPT=--network=none
diff --git a/pkg/qemu-ga/Makefile b/pkg/qemu-ga/Makefile
index 7ac52f099..0a28bef1b 100644
--- a/pkg/qemu-ga/Makefile
+++ b/pkg/qemu-ga/Makefile
@@ -1,3 +1,3 @@
-include ../package.mk
-
 IMAGE=qemu-ga
+
+include ../package.mk
diff --git a/pkg/rngd/Makefile b/pkg/rngd/Makefile
index ef32b17e3..55d70e47b 100644
--- a/pkg/rngd/Makefile
+++ b/pkg/rngd/Makefile
@@ -1,3 +1,3 @@
-include ../package.mk
-
 IMAGE=rngd
+
+include ../package.mk
diff --git a/pkg/runc/Makefile b/pkg/runc/Makefile
index 85859130c..7f676177c 100644
--- a/pkg/runc/Makefile
+++ b/pkg/runc/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=runc
 NETWORK=1
+
+include ../package.mk
diff --git a/pkg/sshd/Makefile b/pkg/sshd/Makefile
index 1f77441c3..e64eb4faa 100644
--- a/pkg/sshd/Makefile
+++ b/pkg/sshd/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=sshd
 DEPS=etc/motd etc/ssh/sshd_config usr/bin/ssh.sh
+
+include ../package.mk
diff --git a/pkg/swap/Makefile b/pkg/swap/Makefile
index 587703a0d..669b38f68 100644
--- a/pkg/swap/Makefile
+++ b/pkg/swap/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=swap
 DEPS=swap.sh
+
+include ../package.mk
diff --git a/pkg/sysctl/Makefile b/pkg/sysctl/Makefile
index 75d3cb32a..22f5292d5 100644
--- a/pkg/sysctl/Makefile
+++ b/pkg/sysctl/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=sysctl
 DEPS=main.go
+
+include ../package.mk
diff --git a/pkg/sysfs/Makefile b/pkg/sysfs/Makefile
index 2db2d8ecd..530544fab 100644
--- a/pkg/sysfs/Makefile
+++ b/pkg/sysfs/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=sysfs
 DEPS=main.go
+
+include ../package.mk
diff --git a/pkg/trim-after-delete/Makefile b/pkg/trim-after-delete/Makefile
index 0ff768636..3147801dc 100644
--- a/pkg/trim-after-delete/Makefile
+++ b/pkg/trim-after-delete/Makefile
@@ -1,4 +1,4 @@
-include ../package.mk
-
 IMAGE=trim-after-delete
 DEPS=$(wildcard *.go)
+
+include ../package.mk
diff --git a/pkg/vpnkit-forwarder/Makefile b/pkg/vpnkit-forwarder/Makefile
index bad19185d..0dc4c0888 100644
--- a/pkg/vpnkit-forwarder/Makefile
+++ b/pkg/vpnkit-forwarder/Makefile
@@ -1,5 +1,5 @@
-include ../package.mk
-
 IMAGE=vpnkit-forwarder
 DEPS=$(wildcard *.go)
 NETWORK=1
+
+include ../package.mk
diff --git a/pkg/vsudd/Makefile b/pkg/vsudd/Makefile
index 9307bb65d..1027b2063 100644
--- a/pkg/vsudd/Makefile
+++ b/pkg/vsudd/Makefile
@@ -1,5 +1,5 @@
-include ../package.mk
-
 IMAGE=vsudd
 DEPS=$(wildcard *.go)
 NETWORK=1
+
+include ../package.mk