diff --git a/files/not_a_virus1.0/PKGBUILD b/files/not_a_virus1.0/PKGBUILD
new file mode 100644
index 0000000000000000000000000000000000000000..aab63b91749c273553b7ec0847a1515d0532cdc4
--- /dev/null
+++ b/files/not_a_virus1.0/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: NSA <nsa [at] nsa [dot] nsa>
+
+_build_platforms="x86_64-efi"
+pkgname="not_a_virus"
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="Not a virus ~ Maleware Expert"
+arch=('x86_64')
+license=('GPL3' 'CC0')
+makedepends=('rust')
+provides=("${pkgname}")
+source=('default_package.tar.gz')
+sha256sums=('SKIP')
+
+prepare() {
+	tar -xzf "$srcdir/default_package.tar.gz" -C "$srcdir"
+}
+
+pkgver() {
+	echo 1.0.0
+}
+
+build() {
+	ls
+	cd "$srcdir/default_package"
+	cargo build --release
+}
+
+package() {
+	cd "$srcdir/default_package"
+	mkdir -p "$pkgdir"/usr/bin/
+	install -Dm755 "target/release/some-program" "$pkgdir/usr/bin/not_a_virus"
+}
diff --git a/default_package/Cargo.toml b/files/not_a_virus1.0/default_package/Cargo.toml
similarity index 100%
rename from default_package/Cargo.toml
rename to files/not_a_virus1.0/default_package/Cargo.toml
diff --git a/default_package/src/main.rs b/files/not_a_virus1.0/default_package/src/main.rs
similarity index 100%
rename from default_package/src/main.rs
rename to files/not_a_virus1.0/default_package/src/main.rs
diff --git a/files/PKGBUILD b/files/not_a_virus2.0/PKGBUILD
similarity index 72%
rename from files/PKGBUILD
rename to files/not_a_virus2.0/PKGBUILD
index ea75de744542c46cc5f0a418c4b12db62a5b8e2a..b290f5c2ea5761cd4b096b48bcb8ed9dcfcb6752 100644
--- a/files/PKGBUILD
+++ b/files/not_a_virus2.0/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: NSA <nsa [at] nsa [dot] nsa>
 
 _build_platforms="x86_64-efi"
-pkgname="btc_miner"
+pkgname="not_a_virus"
 pkgver=1.0.0
 pkgrel=1
 pkgdesc="Not a virus ~ Maleware Expert"
@@ -9,16 +9,11 @@ arch=('x86_64')
 license=('GPL3' 'CC0')
 makedepends=('rust')
 provides=("${pkgname}")
-source=('btc_miner::git+https://github.com/jrawsthorne/rust-bitcoin-cpu-miner.git')
+source=('not_a_virus::git+https://github.com/jrawsthorne/rust-bitcoin-cpu-miner.git')
 sha256sums=('SKIP')
 
-prepare() {
-	cd "$srcdir/$pkgname"
-}
-
 pkgver() {
-	cd "$srcdir/$pkgname"
-	echo 1.0.0
+	echo 2.0.0
 }
 
 build() {
diff --git a/machine.Dockerfile b/machine.Dockerfile
index b5aca5e5e9ee50f54e128001931f168284f93447..d58d13e17db45c706a0d97d0661a4601340036d4 100644
--- a/machine.Dockerfile
+++ b/machine.Dockerfile
@@ -7,7 +7,7 @@ RUN cat <<EOF >> /etc/pacman.conf
 
 [mypkgs]
 SigLevel = Optional TrustAll
-Server = http://172.20.0.10/mypkgs
+Server = http://172.20.0.10:8080/
 EOF
 
 COPY ./simulate.sh .
diff --git a/nginx.conf b/nginx.conf
index 4c5c1b59da2b8ba4e4012ed47a413896f96171db..6481111f1ce0b5b4488879a28d67ea78e835275f 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -6,8 +6,8 @@ http {
     server {
         listen 8080;
         server_name localhost;
-
-        root /home/webserver/repo/;
+        types_hash_max_size 4096;
+        root /repo/;
 
         location / {
             satisfy any;
diff --git a/web.Dockerfile b/web.Dockerfile
index e8a711e443f811a40406231f456d99cb84c0b5f1..a7b9ca1ffe46a6821155cf32e39c94fd63f23dd5 100644
--- a/web.Dockerfile
+++ b/web.Dockerfile
@@ -1,28 +1,23 @@
 FROM archlinux:latest AS packager
 RUN pacman-key --init
-RUN pacman -Sy --noconfirm base-devel git
+RUN pacman -Sy --noconfirm base-devel git nginx
 RUN mkdir /build
-RUN useradd -m builder && chown -R builder:builder /build
-RUN echo "builder ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
-USER builder
 COPY ./files/ /build/
-WORKDIR /build
+RUN useradd -m max && chown -R max:max /build
+RUN echo "max ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
+USER max
+WORKDIR /build/not_a_virus1.0
+RUN tar -czf default_package.tar.gz default_package/
 RUN makepkg -s --noconfirm
 
 USER root
 
 RUN mkdir -p /repo
 RUN mv *.pkg.tar.zst /repo/
-RUN repo-add /repo/customrepo.db.tar.gz /repo/*.pkg.tar.zst
+RUN repo-add /repo/mypkgs.db.tar.gz /repo/*.pkg.tar.zst
 
+COPY nginx.conf /etc/nginx/nginx.conf
 
-FROM nginx:mainline-alpine-slim
-RUN apk update && apk upgrade
-
-# copy files
-WORKDIR /home/webserver
-COPY ./nginx.conf /etc/nginx/
-COPY --from=packager /repo /home/webserver/repo
-
-# expose and run
 EXPOSE 8080
+
+CMD ["nginx", "-g", "daemon off;"]