diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 16e5a69..4cddc6a 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -2,6 +2,7 @@ matrix:
   PLATFORM:
     - linux/amd64
     - linux/arm64
+    - linux/arm/v7
 
 # These checks already get performed on the feature branches
 platform: ${PLATFORM}
@@ -35,6 +36,22 @@ pipeline:
     when:
       event: push
 
+  cli:
+    image: 'chewingbever/vlang:latest'
+    environment:
+      - LDFLAGS=-static
+    commands:
+      - make cli-prod
+      # Make sure the binary is actually statically built
+      - readelf -d vieterctl
+      - du -h vieterctl
+      - '[ "$(readelf -d vieterctl | grep NEEDED | wc -l)" = 0 ]'
+      # This removes so much, it's amazing
+      - strip -s vieterctl
+      - du -h vieterctl
+    when:
+      event: push
+
   upload:
     image: 'chewingbever/vlang:latest'
     secrets: [ s3_username, s3_password ]
@@ -57,5 +74,20 @@ pipeline:
         -H "Content-Type: $CONTENT_TYPE"
         -H "Authorization: AWS $S3_USERNAME:$SIGNATURE"
         https://$URL$OBJ_PATH
+
+      # Also update the CLI tool
+      - export OBJ_PATH="/vieter/commits/$CI_COMMIT_SHA/vieterctl-$(echo '${PLATFORM}' | sed 's:/:-:g')"
+      - export SIG_STRING="PUT\n\n$CONTENT_TYPE\n$DATE\n$OBJ_PATH"
+      - export SIGNATURE=`echo -en $SIG_STRING | openssl sha1 -hmac $S3_PASSWORD -binary | base64`
+      - >
+        curl 
+        --silent
+        -XPUT
+        -T vieterctl
+        -H "Host: $URL"
+        -H "Date: $DATE"
+        -H "Content-Type: $CONTENT_TYPE"
+        -H "Authorization: AWS $S3_USERNAME:$SIGNATURE"
+        https://$URL$OBJ_PATH
     when:
       event: push
diff --git a/.woodpecker/.docker.yml b/.woodpecker/.docker.yml
index 9b605f3..b2f08ca 100644
--- a/.woodpecker/.docker.yml
+++ b/.woodpecker/.docker.yml
@@ -10,7 +10,7 @@ pipeline:
     settings:
       repo: chewingbever/vieter
       tag: dev
-      platforms: [ linux/arm64/v8, linux/amd64 ]
+      platforms: [ linux/arm/v7, linux/arm64/v8, linux/amd64 ]
       build_args_from_env:
         - CI_COMMIT_SHA
     when:
@@ -23,7 +23,7 @@ pipeline:
     settings:
       repo: chewingbever/vieter
       auto_tag: true
-      platforms: [ linux/arm64/v8, linux/amd64 ]
+      platforms: [ linux/arm/v7, linux/arm64/v8, linux/amd64 ]
       build_args_from_env:
         - CI_COMMIT_SHA
     when:
diff --git a/Makefile b/Makefile
index 76ab7b5..7e3c7ea 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,13 @@ dvieter: $(SOURCES)
 # Run the debug build inside gdb
 .PHONY: gdb
 gdb: dvieter
-		gdb --args './dvieter -f vieter.toml server'
+	 VIETER_API_KEY=test \
+		VIETER_DOWNLOAD_DIR=data/downloads \
+		VIETER_DATA_DIR=data/repo \
+		VIETER_PKG_DIR=data/pkgs \
+		VIETER_LOG_LEVEL=DEBUG \
+		VIETER_REPOS_FILE=data/repos.json \
+		gdb --args ./dvieter
 
 # Optimised production build
 .PHONY: prod
@@ -36,15 +42,39 @@ pvieter: $(SOURCES)
 c:
 	$(V) -o vieter.c $(SRC_DIR)
 
+# Build the CLI tool
+.PHONY: cli
+cli: dvieterctl
+dvieterctl: cli.v
+	$(V_PATH) -showcc -g -o dvieterctl cli.v
+
+.PHONY: cli-prod
+cli-prod: vieterctl
+vieterctl: cli.v
+cli-prod:
+	$(V_PATH) -showcc -o vieterctl -prod cli.v
+
 # =====EXECUTION=====
 # Run the server in the default 'data' directory
 .PHONY: run
 run: vieter
-		./vieter -f vieter.toml server
+	 VIETER_API_KEY=test \
+		VIETER_DOWNLOAD_DIR=data/downloads \
+		VIETER_DATA_DIR=data/repo \
+		VIETER_PKG_DIR=data/pkgs \
+		VIETER_LOG_LEVEL=DEBUG \
+		VIETER_REPOS_FILE=data/repos.json \
+		./vieter server
 
 .PHONY: run-prod
 run-prod: prod
-	./pvieter -f vieter.toml server
+	VIETER_API_KEY=test \
+		VIETER_DOWNLOAD_DIR=data/downloads \
+		VIETER_DATA_DIR=data/repo \
+		VIETER_PKG_DIR=data/pkgs \
+		VIETER_LOG_LEVEL=DEBUG \
+		VIETER_REPOS_FILE=data/repos.json \
+	./pvieter server
 
 # =====OTHER=====
 .PHONY: lint
diff --git a/PKGBUILD b/PKGBUILD
index cb0c24a..767c07c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jef Roosens
 
 pkgbase='vieter'
-pkgname='vieter'
+pkgname=('vieter' 'vieterctl')
 pkgver=0.1.0.rc1.r45.g6d3ff8a
 pkgrel=1
 depends=('glibc' 'openssl' 'libarchive' 'gc')
@@ -23,12 +23,21 @@ build() {
     # Build the compiler
     CFLAGS= make v
 
+    # Build the server & the CLI tool
     make prod
+    make cli-prod
 }
 
-package() {
+package_vieter() {
     pkgdesc="Vieter is a lightweight implementation of an Arch repository server."
     install -dm755 "$pkgdir/usr/bin"
 
     install -Dm755 "$pkgbase/pvieter" "$pkgdir/usr/bin/vieter"
 }
+
+package_vieterctl() {
+    pkgdesc="Allows you to configure a Vieter server's list of Git repositories."
+    install -dm755 "$pkgdir/usr/bin"
+
+    install -Dm755 "$pkgbase/vieterctl" "$pkgdir/usr/bin/vieterctl"
+}
diff --git a/cli.v b/cli.v
new file mode 100644
index 0000000..256b856
--- /dev/null
+++ b/cli.v
@@ -0,0 +1,84 @@
+import os
+import toml
+import net.http
+
+struct Config {
+	address string [required]
+	api_key string [required]
+}
+
+fn list(conf Config) ? {
+	mut req := http.new_request(http.Method.get, '$conf.address/api/repos', '') ?
+	req.add_custom_header('X-API-Key', conf.api_key) ?
+
+	res := req.do() ?
+
+	println(res.text)
+}
+
+fn add(conf Config, args []string) ? {
+	if args.len < 2 {
+		eprintln('Not enough arguments.')
+		exit(1)
+	}
+
+	if args.len > 2 {
+		eprintln('Too many arguments.')
+		exit(1)
+	}
+
+	mut req := http.new_request(http.Method.post, '$conf.address/api/repos?url=${args[0]}&branch=${args[1]}', '') ?
+	req.add_custom_header('X-API-Key', conf.api_key) ?
+
+	res := req.do() ?
+
+	println(res.text)
+}
+
+fn remove(conf Config, args []string) ? {
+	if args.len < 2 {
+		eprintln('Not enough arguments.')
+		exit(1)
+	}
+
+	if args.len > 2 {
+		eprintln('Too many arguments.')
+		exit(1)
+	}
+
+	mut req := http.new_request(http.Method.delete, '$conf.address/api/repos?url=${args[0]}&branch=${args[1]}', '') ?
+	req.add_custom_header('X-API-Key', conf.api_key) ?
+
+	res := req.do() ?
+
+	println(res.text)
+}
+
+fn main() {
+	conf_path := os.expand_tilde_to_home('~/.vieterrc')
+
+	if !os.is_file(conf_path) {
+		exit(1)
+	}
+
+	conf := toml.parse_file(conf_path) ?.reflect<Config>()
+
+	args := os.args[1..]
+
+	if args.len == 0 {
+		eprintln('No action provided.')
+		exit(1)
+	}
+
+	action := args[0]
+
+	match action {
+		'list' { list(conf) ? }
+		'add' { add(conf, args[1..]) ? }
+		'remove' { remove(conf, args[1..]) ? }
+		else {
+			eprintln("Invalid action '$action'.")
+			exit(1)
+		}
+	}
+}
diff --git a/src/build/build.v b/src/build.v
similarity index 95%
rename from src/build/build.v
rename to src/build.v
index 934627f..51de64c 100644
--- a/src/build/build.v
+++ b/src/build.v
@@ -1,11 +1,12 @@
-module build
+module main
 
 import docker
 import encoding.base64
 import time
-import net.http
-import git
 import json
+import server
+import env
+import net.http
 
 const container_build_dir = '/build'
 
@@ -61,13 +62,15 @@ fn create_build_image() ?string {
 	return image.id
 }
 
-fn build(conf Config) ? {
+fn build() ? {
+	conf := env.load<env.BuildConfig>() ?
+
 	// We get the repos list from the Vieter instance
 	mut req := http.new_request(http.Method.get, '$conf.address/api/repos', '') ?
 	req.add_custom_header('X-Api-Key', conf.api_key) ?
 
 	res := req.do() ?
-	repos := json.decode([]git.GitRepo, res.text) ?
+	repos := json.decode([]server.GitRepo, res.text) ?
 
 	// No point in doing work if there's no repos present
 	if repos.len == 0 {
diff --git a/src/build/cli.v b/src/build/cli.v
deleted file mode 100644
index c95d1ca..0000000
--- a/src/build/cli.v
+++ /dev/null
@@ -1,24 +0,0 @@
-module build
-
-import cli
-import env
-
-pub struct Config {
-pub:
-	api_key string
-	address string
-}
-
-// cmd returns the cli submodule that handles the build process
-pub fn cmd() cli.Command {
-	return cli.Command{
-		name: 'build'
-		description: 'Run the build process.'
-		execute: fn (cmd cli.Command) ? {
-			config_file := cmd.flags.get_string('config-file') ?
-			conf := env.load<Config>(config_file) ?
-
-			build(conf) ?
-		}
-	}
-}
diff --git a/src/env.v b/src/env.v
index cbde67e..3e71a09 100644
--- a/src/env.v
+++ b/src/env.v
@@ -1,7 +1,6 @@
 module env
 
 import os
-import toml
 
 // The prefix that every environment variable should have
 const prefix = 'VIETER_'
@@ -10,15 +9,32 @@ const prefix = 'VIETER_'
 // instead
 const file_suffix = '_FILE'
 
+pub struct ServerConfig {
+pub:
+	log_level    string [default: WARN]
+	log_file     string [default: 'vieter.log']
+	pkg_dir      string
+	download_dir string
+	api_key      string
+	data_dir     string
+	repos_file   string
+}
+
+pub struct BuildConfig {
+pub:
+	api_key string
+	address string
+}
+
 fn get_env_var(field_name string) ?string {
 	env_var_name := '$env.prefix$field_name.to_upper()'
 	env_file_name := '$env.prefix$field_name.to_upper()$env.file_suffix'
 	env_var := os.getenv(env_var_name)
 	env_file := os.getenv(env_file_name)
 
-	// If both are missing, we return an empty string
+	// If both aren't set, we report them missing
 	if env_var == '' && env_file == '' {
-		return ''
+		return error('Either $env_var_name or $env_file_name is required.')
 	}
 
 	// If they're both set, we report a conflict
@@ -40,42 +56,30 @@ fn get_env_var(field_name string) ?string {
 	}
 }
 
-// load<T> attempts to create an object of type T from the given path to a toml
-// file & environment variables. For each field, it will select either a value
-// given from an environment variable, a value defined in the config file or a
-// configured default if present, in that order.
-pub fn load<T>(path string) ?T {
-	mut res := T{}
-
-	if os.exists(path) {
-		// We don't use reflect here because reflect also sets any fields not
-		// in the toml back to their zero value, which we don't want
-		doc := toml.parse_file(path) ?
-
-		$for field in T.fields {
-			s := doc.value(field.name)
-
-			// We currently only support strings
-			if s.type_name() == 'string' {
-				res.$(field.name) = s.string()
-			}
-		}
-	}
+// load<T> attempts to create the given type from environment variables. For
+// each field, the corresponding env var is its name in uppercase prepended
+// with the hardcoded prefix. If this one isn't present, it looks for the env
+// var with the file_suffix suffix.
+pub fn load<T>() ?T {
+	res := T{}
 
 	$for field in T.fields {
-		$if field.typ is string {
-			env_value := get_env_var(field.name) ?
+		res.$(field.name) = get_env_var(field.name) or {
+			// We use the default instead, if it's present
+			mut default := ''
 
-			// The value of the env var will always be chosen over the config
-			// file
-			if env_value != '' {
-				res.$(field.name) = env_value
+			for attr in field.attrs {
+				if attr.starts_with('default: ') {
+					default = attr[9..]
+					break
+				}
 			}
-			// If there's no value from the toml file either, we try to find a
-			// default value
-			else if res.$(field.name) == '' {
-				return error("Missing config variable '$field.name' with no provided default. Either add it to the config file or provide it using an environment variable.")
+
+			if default == '' {
+				return err
 			}
+
+			default
 		}
 	}
 	return res
diff --git a/src/git/cli.v b/src/git/cli.v
deleted file mode 100644
index 17fa984..0000000
--- a/src/git/cli.v
+++ /dev/null
@@ -1,83 +0,0 @@
-module git
-
-import cli
-import env
-import net.http
-
-struct Config {
-	address string [required]
-	api_key string [required]
-}
-
-// cmd returns the cli submodule that handles the repos API interaction
-pub fn cmd() cli.Command {
-	return cli.Command{
-		name: 'repos'
-		description: 'Interact with the repos API.'
-		commands: [
-			cli.Command{
-				name: 'list'
-				description: 'List the current repos.'
-				execute: fn (cmd cli.Command) ? {
-					config_file := cmd.flags.get_string('config-file') ?
-					conf := env.load<Config>(config_file) ?
-
-					list(conf) ?
-				}
-			},
-			cli.Command{
-				name: 'add'
-				required_args: 2
-				usage: 'url branch'
-				description: 'Add a new repository.'
-				execute: fn (cmd cli.Command) ? {
-					config_file := cmd.flags.get_string('config-file') ?
-					conf := env.load<Config>(config_file) ?
-
-					add(conf, cmd.args[0], cmd.args[1]) ?
-				}
-			},
-			cli.Command{
-				name: 'remove'
-				required_args: 2
-				usage: 'url branch'
-				description: 'Remove a repository.'
-				execute: fn (cmd cli.Command) ? {
-					config_file := cmd.flags.get_string('config-file') ?
-					conf := env.load<Config>(config_file) ?
-
-					remove(conf, cmd.args[0], cmd.args[1]) ?
-				}
-			},
-		]
-	}
-}
-
-fn list(conf Config) ? {
-	mut req := http.new_request(http.Method.get, '$conf.address/api/repos', '') ?
-	req.add_custom_header('X-API-Key', conf.api_key) ?
-
-	res := req.do() ?
-
-	println(res.text)
-}
-
-fn add(conf Config, url string, branch string) ? {
-	mut req := http.new_request(http.Method.post, '$conf.address/api/repos?url=$url&branch=$branch',
-		'') ?
-	req.add_custom_header('X-API-Key', conf.api_key) ?
-
-	res := req.do() ?
-
-	println(res.text)
-}
-
-fn remove(conf Config, url string, branch string) ? {
-	mut req := http.new_request(http.Method.delete, '$conf.address/api/repos?url=$url&branch=$branch',
-		'') ?
-	req.add_custom_header('X-API-Key', conf.api_key) ?
-
-	res := req.do() ?
-
-	println(res.text)
-}
diff --git a/src/git/git.v b/src/git/git.v
deleted file mode 100644
index 913bc39..0000000
--- a/src/git/git.v
+++ /dev/null
@@ -1,41 +0,0 @@
-module git
-
-import os
-import json
-
-pub struct GitRepo {
-pub:
-	url    string [required]
-	branch string [required]
-}
-
-// read_repos reads the given JSON file & parses it as a list of Git repos
-pub fn read_repos(path string) ?[]GitRepo {
-	if !os.exists(path) {
-		mut f := os.create(path) ?
-
-		defer {
-			f.close()
-		}
-
-		f.write_string('[]') ?
-
-		return []
-	}
-
-	content := os.read_file(path) ?
-	res := json.decode([]GitRepo, content) ?
-	return res
-}
-
-// write_repos writes a list of repositories back to a given file
-pub fn write_repos(path string, repos []GitRepo) ? {
-	mut f := os.create(path) ?
-
-	defer {
-		f.close()
-	}
-
-	value := json.encode(repos)
-	f.write_string(value) ?
-}
diff --git a/src/main.v b/src/main.v
index c77e551..156f0a3 100644
--- a/src/main.v
+++ b/src/main.v
@@ -2,32 +2,16 @@ module main
 
 import os
 import server
-import cli
-import build
-import git
+import util
 
 fn main() {
-	mut app := cli.Command{
-		name: 'vieter'
-		description: 'Vieter is a lightweight implementation of an Arch repository server.'
-		version: '0.1.0'
-		flags: [
-			cli.Flag{
-				flag: cli.FlagType.string
-				name: 'config-file'
-				abbrev: 'f'
-				description: 'Location of Vieter config file; defaults to ~/.vieterrc.'
-				global: true
-				default_value: [os.expand_tilde_to_home('~/.vieterrc')]
-			},
-		]
-		commands: [
-			server.cmd(),
-			build.cmd(),
-			git.cmd(),
-		]
+	if os.args.len == 1 {
+		util.exit_with_message(1, 'No action provided.')
 	}
 
-	app.setup()
-	app.parse(os.args)
+	match os.args[1] {
+		'server' { server.server() ? }
+		'build' { build() ? }
+		else { util.exit_with_message(1, 'Unknown action: ${os.args[1]}') }
+	}
 }
diff --git a/src/server/cli.v b/src/server/cli.v
deleted file mode 100644
index 9820cf8..0000000
--- a/src/server/cli.v
+++ /dev/null
@@ -1,29 +0,0 @@
-module server
-
-import cli
-import env
-
-struct Config {
-pub:
-	log_level    string = 'WARN'
-	log_file     string = 'vieter.log'
-	pkg_dir      string
-	download_dir string
-	api_key      string
-	data_dir     string
-	repos_file   string
-}
-
-// cmd returns the cli submodule that handles starting the server
-pub fn cmd() cli.Command {
-	return cli.Command{
-		name: 'server'
-		description: 'Start the Vieter server.'
-		execute: fn (cmd cli.Command) ? {
-			config_file := cmd.flags.get_string('config-file') ?
-			conf := env.load<Config>(config_file) ?
-
-			server(conf) ?
-		}
-	}
-}
diff --git a/src/server/git.v b/src/server/git.v
index 3ec8eeb..0147d87 100644
--- a/src/server/git.v
+++ b/src/server/git.v
@@ -1,10 +1,46 @@
 module server
 
 import web
-import git
+import os
+import json
 
 const repos_file = 'repos.json'
 
+pub struct GitRepo {
+pub:
+	url    string [required]
+	branch string [required]
+}
+
+fn read_repos(path string) ?[]GitRepo {
+	if !os.exists(path) {
+		mut f := os.create(path) ?
+
+		defer {
+			f.close()
+		}
+
+		f.write_string('[]') ?
+
+		return []
+	}
+
+	content := os.read_file(path) ?
+	res := json.decode([]GitRepo, content) ?
+	return res
+}
+
+fn write_repos(path string, repos []GitRepo) ? {
+	mut f := os.create(path) ?
+
+	defer {
+		f.close()
+	}
+
+	value := json.encode(repos)
+	f.write_string(value) ?
+}
+
 ['/api/repos'; get]
 fn (mut app App) get_repos() web.Result {
 	if !app.is_authorized() {
@@ -12,7 +48,7 @@ fn (mut app App) get_repos() web.Result {
 	}
 
 	repos := rlock app.git_mutex {
-		git.read_repos(app.conf.repos_file) or {
+		read_repos(app.conf.repos_file) or {
 			app.lerror('Failed to read repos file.')
 
 			return app.server_error(500)
@@ -32,13 +68,13 @@ fn (mut app App) post_repo() web.Result {
 		return app.server_error(400)
 	}
 
-	new_repo := git.GitRepo{
+	new_repo := GitRepo{
 		url: app.query['url']
 		branch: app.query['branch']
 	}
 
 	mut repos := rlock app.git_mutex {
-		git.read_repos(app.conf.repos_file) or {
+		read_repos(app.conf.repos_file) or {
 			app.lerror('Failed to read repos file.')
 
 			return app.server_error(500)
@@ -55,7 +91,7 @@ fn (mut app App) post_repo() web.Result {
 	repos << new_repo
 
 	lock app.git_mutex {
-		git.write_repos(app.conf.repos_file, repos) or { return app.server_error(500) }
+		write_repos(app.conf.repos_file, repos) or { return app.server_error(500) }
 	}
 
 	return app.ok('Repo added successfully.')
@@ -71,13 +107,13 @@ fn (mut app App) delete_repo() web.Result {
 		return app.server_error(400)
 	}
 
-	repo_to_remove := git.GitRepo{
+	repo_to_remove := GitRepo{
 		url: app.query['url']
 		branch: app.query['branch']
 	}
 
 	mut repos := rlock app.git_mutex {
-		git.read_repos(app.conf.repos_file) or {
+		read_repos(app.conf.repos_file) or {
 			app.lerror('Failed to read repos file.')
 
 			return app.server_error(500)
@@ -86,7 +122,7 @@ fn (mut app App) delete_repo() web.Result {
 	filtered := repos.filter(it != repo_to_remove)
 
 	lock app.git_mutex {
-		git.write_repos(app.conf.repos_file, filtered) or { return app.server_error(500) }
+		write_repos(app.conf.repos_file, filtered) or { return app.server_error(500) }
 	}
 
 	return app.ok('Repo removed successfully.')
diff --git a/src/server/server.v b/src/server/server.v
index 7b59896..db2c9ae 100644
--- a/src/server/server.v
+++ b/src/server/server.v
@@ -4,6 +4,7 @@ import web
 import os
 import log
 import repo
+import env
 import util
 
 const port = 8000
@@ -11,7 +12,7 @@ const port = 8000
 struct App {
 	web.Context
 pub:
-	conf Config [required; web_global]
+	conf env.ServerConfig [required; web_global]
 pub mut:
 	repo repo.RepoGroupManager [required; web_global]
 	// This is used to claim the file lock on the repos file
@@ -19,7 +20,9 @@ pub mut:
 }
 
 // server starts the web server & starts listening for requests
-pub fn server(conf Config) ? {
+pub fn server() ? {
+	conf := env.load<env.ServerConfig>() ?
+
 	// Configure logger
 	log_level := log.level_from_tag(conf.log_level) or {
 		util.exit_with_message(1, 'Invalid log level. The allowed values are FATAL, ERROR, WARN, INFO & DEBUG.')
diff --git a/vieter.toml b/vieter.toml
deleted file mode 100644
index fb05d6f..0000000
--- a/vieter.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file contains settings used during development
-api_key = "test"
-download_dir = "data/downloads"
-data_dir = "data"
-pkg_dir = "data/pkgs"
-# log_level = "DEBUG"
-repos_file = "data/repos.json"
-
-address = "http://localhost:8000"