diff --git a/build/build-image.sh b/build/build-image.sh
index ea84ef7..ff070d2 100755
--- a/build/build-image.sh
+++ b/build/build-image.sh
@@ -4,6 +4,7 @@ set -eo pipefail
 
 NPROC=$(nproc)
 VERSION=$(date +%Y%m%d)$MINOR
+IMAGE_ID="standard"
 export VERSION="$VERSION"
 
 # This variable gets unset if any security-critical elements are disabled
@@ -67,8 +68,6 @@ export ROOT="$DISTPATH"
 #emerge -j "$NPROC" --quiet @halogenos-image
 emerge --unmerge portage
 
-emerge gentoolkit
-
 # Include any additional files
 mkdir -p "$DISTPATH"/usr/share/halogenos
 mkdir -p "$DISTPATH"/usr/share/halogenos/keys
@@ -81,7 +80,8 @@ done
 
 cp -r /build/include-image/* "$DISTPATH"/
 
-echo "IMAGE_VERSION="$VERSION"" >> "$DISTPATH"/usr/lib/os-release
+echo "IMAGE_VERSION=$VERSION" >> "$DISTPATH"/usr/lib/os-release
+echo "IMAGE_ID=$IMAGE_ID" >> "$DISTPATH"/usr/lib/os-release
 
 # Install gvisor OCI runtime
 /build/external/gvisor.sh
@@ -110,6 +110,12 @@ SECURESYS=$SECURESYS" > "$DISTPATH"/usr/share/halogenos/release.meta
 
 # Make any additional config changes
 
+# Remove unwanted files
+rm "$DISTPATH"/usr/etc/gentoo-release
+rm -r "$DISTPATH"/usr/lib/gentoo
+rm -r "$DISTPATH"/usr/lib/portage
+rm -r "$DISTPATH"/usr/share/portage
+
 # Create images dir and img files
 mkdir -p /build/images
 cp "$DISTPATH"/usr/share/halogenos/release.meta /build/images/
diff --git a/build/external/gvisor.sh b/build/external/gvisor.sh
index 27e134e..93073f2 100755
--- a/build/external/gvisor.sh
+++ b/build/external/gvisor.sh
@@ -10,4 +10,5 @@ sha512sum -c runsc.sha512 -c containerd-shim-runsc-v1.sha512
 rm -f ./*.sha512
 
 chmod a+rx runsc containerd-shim-runsc-v1
+mkdir -p "$DISTPATH"/usr/local/bin
 mv runsc containerd-shim-runsc-v1 "$DISTPATH"/usr/local/bin
\ No newline at end of file
diff --git a/build/include-image/usr/etc/docker/issue b/build/include-image/usr/etc/docker/issue
new file mode 100644
index 0000000..2edca5c
--- /dev/null
+++ b/build/include-image/usr/etc/docker/issue
@@ -0,0 +1,5 @@
+
+Host: \n.\O
+System: \s \m \r 
+\t, \U logged in
+
diff --git a/build/include-image/usr/etc/docker/issue.logo b/build/include-image/usr/etc/docker/issue.logo
new file mode 100644
index 0000000..98e42c0
--- /dev/null
+++ b/build/include-image/usr/etc/docker/issue.logo
@@ -0,0 +1,16 @@
+                                                                                           
+                         ,,                                                                 
+ `7MMF'  `7MMF'         `7MM                                         .g8""8q.    .M"""bgd    
+   MM      MM             MM                                       .dP'    `YM. ,MI    "Y    
+   MM      MM   ,6"Yb.    MM  ,pW"Wq.   .P"Ybmmm .gP"Ya `7MMpMMMb. dM'      `MM `MMb.        
+   MMmmmmmmMM  8)   MM    MM 6W'   `Wb :MI  I8  ,M'   Yb  MM    MM MM        MM   `YMMNq.    
+   MM      MM   ,pm9MM    MM 8M     M8  WmmmP"  8M""""""  MM    MM MM.      ,MP .     `MM    
+   MM      MM  8M   MM    MM YA.   ,A9 8M       YM.    ,  MM    MM `Mb.    ,dP' Mb     dM ,, 
+ .JMML.  .JMML.`Moo9^Yo..JMML.`Ybmd9'   YMMMMMb  `Mbmmd'.JMML  JMML. `"bmmd"'   P"Ybmmd"  db 
+                                       6'     dP                                             
+                                       Ybmmmd'                                               
+
+Host: \n.\O
+System: \s \m \r 
+\t, \U logged in
+
diff --git a/build/include-image/usr/lib/os-release b/build/include-image/usr/lib/os-release
index dd6d1c8..dd7423c 100644
--- a/build/include-image/usr/lib/os-release
+++ b/build/include-image/usr/lib/os-release
@@ -1,9 +1,8 @@
 NAME=HalogenOS
-ID=halogen
+ID=halogenos
 PRETTY_NAME="HalogenOS"
 ANSI_COLOR="36;46"
 HOME_URL="https://git.shibedrill.site/HalogenOS"
 SUPPORT_URL="https://git.shibedrill.site/HalogenOS/image-builder/issues"
 BUG_REPORT_URL="https://git.shibedrill.site/HalogenOS/image-builder/issues"
 DOCUMENTATION_URL="https://git.shibedrill.site/HalogenOS/image-builder/wiki"
-VERSION_ID="0.1"