diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index dd47b908..55d9ef7b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -2,7 +2,7 @@ name: Docker
 
 on:
   push:
-    branches: master
+    branches: main
 
 jobs:
   docker:
@@ -26,22 +26,27 @@ jobs:
 
       - name: Login to Github Packages
         uses: docker/login-action@v1
-        env:
-          GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.GHCR_TOKEN }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tags: |
+            sha_${{ github.sha }}
+            latest
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build
         id: docker_build
         uses: docker/build-push-action@v2
-        env:
-          GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
         with:
           push: true
-          tags: |
-            ghcr.io/syncforynab/fintech-to-ynab:sha_${{ github.sha }}
-            ghcr.io/syncforynab/fintech-to-ynab:latest
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=local,src=/tmp/.docker-buildx-cache
           cache-to: type=local,dest=/tmp/.docker-buildx-cache
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 6a21e9aa..cb5bdf64 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -38,4 +38,10 @@
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+  # Prevent "Blocked host: hostname"
+  if ENV["APP_HOSTNAME"].present?
+    config.hosts << ENV["APP_HOSTNAME"]
+  end
+
 end