diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..1cf15ae2
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,10 @@
+.dockerignore
+.gitignore
+*.md
+.git/
+.idea/
+.DS_Store/
+docker-compose.*
+LICENSE
+nginx.conf
+yarn.lock
diff --git a/.env.example b/.env.example
index 19e36d8c..e8c6a0c8 100644
--- a/.env.example
+++ b/.env.example
@@ -5,11 +5,11 @@ APP_LOG_LEVEL=debug
 APP_URL=http://crater.test
 
 DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
+DB_HOST=db
 DB_PORT=3306
 DB_DATABASE=crater
-DB_USERNAME=root
-DB_PASSWORD=bytefury
+DB_USERNAME=crater
+DB_PASSWORD=crater
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
diff --git a/.gitignore b/.gitignore
index 0afb940b..5f355185 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ Homestead.yaml
 .rnd
 /.expo
 /.vscode
+docker-compose.yml
+docker-compose.yaml
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..c3fa5a83
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,52 @@
+##### STAGE 1 #####
+
+FROM composer as composer
+
+# Copy composer files from project root into composer container's working dir
+COPY composer.* /app/
+
+# Copy database directory for autoloader optimization
+COPY database /app/database
+
+# Run composer to build dependencies in vendor folder
+RUN composer install --no-scripts --no-suggest --no-interaction --prefer-dist --optimize-autoloader 
+
+# Copy everything from project root into composer container's working dir
+COPY . /app
+ 
+RUN composer dump-autoload --optimize --classmap-authoritative
+
+##### STAGE 2 #####
+
+FROM php:7.3.12-fpm-alpine
+
+# Use the default production configuration
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
+RUN apk add --no-cache libpng-dev libxml2-dev oniguruma-dev && \
+    docker-php-ext-install bcmath ctype json gd mbstring pdo pdo_mysql tokenizer xml
+
+# Set container's working dir
+WORKDIR /app
+ 
+# Copy everything from project root into php container's working dir
+COPY . /app
+
+# Copy vendor folder from composer container into php container
+COPY --from=composer /app/vendor /app/vendor
+
+RUN touch database/database.sqlite && \
+    cp .env.example .env && \
+    php artisan config:cache && \
+    php artisan passport:keys && \
+    php artisan key:generate && \
+    chown -R www-data:www-data . && \
+    chmod -R 755 . && \
+    chmod -R 775 storage/framework/ && \
+    chmod -R 775 storage/logs/ && \
+    chmod -R 775 bootstrap/cache/  
+
+EXPOSE 9000
+
+CMD ["php-fpm", "--nodaemonize"]
+
diff --git a/config/app.php b/config/app.php
index 0d4c2fc4..245b5c38 100644
--- a/config/app.php
+++ b/config/app.php
@@ -1,4 +1,4 @@
- <?php
+<?php
 
 return [
 
diff --git a/docker-compose.yaml.example b/docker-compose.yaml.example
new file mode 100644
index 00000000..590e4c2a
--- /dev/null
+++ b/docker-compose.yaml.example
@@ -0,0 +1,40 @@
+version: '3.1'
+
+services:
+
+  web:
+    image: nginx
+    depends_on:
+      - php
+    ports:
+      - 8080:80
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+      - app:/app
+    restart: always 
+    
+  php:
+    build: .
+    depends_on:
+      - db
+    expose:
+      - 9000
+    volumes:
+      - app:/app
+    restart: always
+
+  db:
+    image: mariadb
+    restart: always
+    volumes:
+      - db:/var/lib/mysql
+    environment:
+      MYSQL_USER: crater
+      MYSQL_PASSWORD: crater
+      MYSQL_DATABASE: crater
+      MYSQL_ROOT_PASSWORD: crater
+
+volumes:
+  app:
+  db:
+
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 00000000..36645fa7
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,53 @@
+worker_processes  8;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  4096;
+}
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+
+    keepalive_timeout  65;
+
+    server {
+        listen 80 default_server;
+
+        root /app/public;
+        index index.php;
+        charset utf-8;
+
+        access_log off;
+
+        location / {
+            try_files $uri $uri/ /index.php?$query_string;
+        }
+
+        location = /favicon.ico { access_log off; log_not_found off; }
+        location = /robots.txt  { access_log off; log_not_found off; }
+
+        add_header X-Content-Type-Options nosniff;
+        add_header X-XSS-Protection "1; mode=block";
+        add_header X-Robots-Tag none;
+        add_header Content-Security-Policy "frame-ancestors 'self'";
+
+        location ~ \.php$ {
+            fastcgi_pass php:9000;
+            fastcgi_index index.php;
+            include fastcgi_params;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            include /etc/nginx/fastcgi_params;
+        }
+    }
+}
diff --git a/readme.md b/readme.md
index 80006e99..504d5b64 100644
--- a/readme.md
+++ b/readme.md
@@ -60,6 +60,10 @@ Join the Crater discord server to discuss:
 ## Credits
 Crater is a product of [Bytefury](https://bytefury.com)
 
+**Special thanks to:**
+* [Birkhoff Lee](https://github.com/BirkhoffLee)
+
+
 ## Translate
 Help us translate on [Transifex](https://www.transifex.com/bytefury/crater-invoice)
 
diff --git a/resources/assets/js/views/wizard/UserProfile.vue b/resources/assets/js/views/wizard/UserProfile.vue
index 977ce05e..774a7ba7 100644
--- a/resources/assets/js/views/wizard/UserProfile.vue
+++ b/resources/assets/js/views/wizard/UserProfile.vue
@@ -18,7 +18,7 @@
           </div>
         </div>
         <avatar-cropper
-          :labels="{ submit: 'submit', cancel: 'Cancle'}"
+          :labels="{ submit: 'submit', cancel: 'Cancel'}"
           :cropper-options="cropperOptions"
           :output-options="cropperOutputOptions"
           :output-quality="0.8"
diff --git a/routes/api.php b/routes/api.php
index f5927df6..c395287d 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -46,16 +46,6 @@ Route::get('/countries', [
     'uses' => 'LocationController@getCountries'
 ]);
 
-Route::get('/states/{id}', [
-    'as' => 'states',
-    'uses' => 'LocationController@getStates'
-]);
-
-Route::get('/cities/{id}', [
-    'as' => 'cities',
-    'uses' => 'LocationController@getCities'
-]);
-
 
 // Onboarding
 //----------------------------------