diff --git a/.env b/.env
new file mode 100644
index 000000000..a59b8881d
--- /dev/null
+++ b/.env
@@ -0,0 +1,5 @@
+FILTERLISTS_CONNECTION_STRING="Server=mariadb;Database=filterlists;Uid=filterlists;Pwd=filterlists;"
+FILTERLISTS_MYSQL_ROOT_PASSWORD=filterlists
+FILTERLISTS_MYSQL_DATABASE=filterlists
+FILTERLISTS_MYSQL_USER=filterlists
+FILTERLISTS_MYSQL_PASSWORD=filterlists
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 6174512bf..bd381b8cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,9 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# Mono auto generated files
+mono_crash.*
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
@@ -182,6 +185,8 @@ PublishScripts/
 
 # NuGet Packages
 *.nupkg
+# NuGet Symbol Packages
+*.snupkg
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
@@ -206,6 +211,8 @@ BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
 *.appx
+*.appxbundle
+*.appxupload
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -231,8 +238,6 @@ orleans.codegen.cs
 # Since there are multiple workflows, uncomment next line to ignore bower_components
 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
 #bower_components/
-# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true
-**/wwwroot/lib/
 
 # RIA/Silverlight projects
 Generated_Code/
@@ -257,6 +262,9 @@ ServiceFabricBackup/
 *.bim.layout
 *.bim_*.settings
 *.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -292,10 +300,6 @@ paket-files/
 # FAKE - F# Make
 .fake/
 
-# JetBrains Rider
-.idea/
-*.sln.iml
-
 # CodeRush personal settings
 .cr/personal
 
@@ -337,9 +341,12 @@ ASALocalRun/
 # Local History for Visual Studio
 .localhistory/
 
-# BeatPulse healthcheck temp database 
+# BeatPulse healthcheck temp database
 healthchecksdb
 
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
 # FilterLists Custom Ignores
 appsettings*.json
 src/FilterLists.Web/wwwroot/dist
\ No newline at end of file
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 1284fbd6d..50ba8321b 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,8 +1,7 @@
 version: "3.7"
 
-services:
-  api:
-    image: collinbarrett/filterlists.api:latest
-
-  web:
-    image: collinbarrett/filterlists.web:latest
+networks:
+  # https://github.com/collinbarrett/wp-host-on-containers/blob/master/docker-compose.nginx.yml
+  reverse-proxy:
+    external:
+      name: wp-host_reverse-proxy
diff --git a/docker-compose.yml b/docker-compose.yml
index 551179741..53faf1f9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - ./ops/nginx/conf.d:/etc/nginx/conf.d:ro
 
   web:
-    image: collinbarrett/filterlists.web
+    image: collinbarrett/filterlists.web:latest
     restart: always
     build:
       context: .
@@ -24,7 +24,7 @@ services:
       - api
 
   api:
-    image: collinbarrett/filterlists.api
+    image: collinbarrett/filterlists.api:latest
     restart: always
     build:
       context: .
@@ -36,7 +36,7 @@ services:
     depends_on:
       - mariadb
     environment:
-      ConnectionStrings__FilterListsConnection: "Server=mariadb;Database=filterlistsdata;Uid=filterlists;Pwd=C53A28194242D82288E1E84A37E56D3EC7DFF83F1D9E018AF19E9BA27A5DF833;"
+      ConnectionStrings__FilterListsConnection: ${FILTERLISTS_CONNECTION_STRING}
 
   mariadb:
     image: mariadb:10
@@ -46,10 +46,10 @@ services:
     volumes:
       - data:/var/lib/mysql
     environment:
-      MYSQL_RANDOM_ROOT_PASSWORD: "yes"
-      MYSQL_DATABASE: filterlistsdata
-      MYSQL_USER: filterlists
-      MYSQL_PASSWORD: C53A28194242D82288E1E84A37E56D3EC7DFF83F1D9E018AF19E9BA27A5DF833
+      MYSQL_ROOT_PASSWORD: ${FILTERLISTS_MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${FILTERLISTS_MYSQL_DATABASE}
+      MYSQL_USER: ${FILTERLISTS_MYSQL_USER}
+      MYSQL_PASSWORD: ${FILTERLISTS_MYSQL_PASSWORD}
     command:
       [
         "mysqld",