diff --git a/config/000-default.conf b/config/000-default.conf
new file mode 100644
index 0000000..575aefe
--- /dev/null
+++ b/config/000-default.conf
@@ -0,0 +1,13 @@
+<VirtualHost *:80>
+  ServerAdmin webmaster@localhost
+  DocumentRoot /root/trackdirect/htdocs/public
+
+  ErrorLog ${APACHE_LOG_DIR}/error.log
+  CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
+
+<Directory "/root/trackdirect/htdocs/public">
+  Options Indexes MultiViews
+  AllowOverride All
+  Require all granted
+</Directory>
diff --git a/misc/aprsc.conf b/config/aprsc.conf
similarity index 97%
rename from misc/aprsc.conf
rename to config/aprsc.conf
index b8aa71d..dec056d 100755
--- a/misc/aprsc.conf
+++ b/config/aprsc.conf
@@ -27,5 +27,3 @@ HTTPStatusOptions ShowEmail=1
 # After configuring the rest of the settings, remove this bad command
 # from the configuration file. It's here only to avoid starting the
 # server up accidentally with an invalid configuration.
-MagicBadness	42.7
-
diff --git a/config/trackdirect.ini b/config/trackdirect.ini
index ba50fed..62d2cfe 100644
--- a/config/trackdirect.ini
+++ b/config/trackdirect.ini
@@ -5,9 +5,9 @@
 [database]
 
 ;; Basic database settings
-host="127.0.0.1"
+host="db"
 database="trackdirect"
-;username="username"
+username="root"
 password="foobar"
 port="5432"
 
@@ -74,7 +74,7 @@ max_queued_realtime_packets="30"
 
 [collector0]
 
-host="127.0.0.1"
+host="aprsc"
 port_full="10152"
 port_filtered="14580"