diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 68de3c2b..10238e6b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -36,8 +36,8 @@ jobs:
         with:
           ref: ${{ github.event.workflow_run.head_branch || github.ref }}
 
-      # - name: Set up Docker Buildx
-      #   uses: docker/setup-buildx-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Set BRANCH_TAG
         uses: nimblehq/branch-tag-action@v1
@@ -70,19 +70,14 @@ jobs:
           username: ${{ env.DOCKER_USERNAME }}
           password: ${{ env.DOCKER_TOKEN }}
 
-      # - name: Docker build and push
-      #   uses: docker/build-push-action@v5
-      #   with:
-      #     context: .
-      #     push: true
-      #     tags: ${{ env.DOCKER_IMAGE_TAG }}
-      #     cache-from: type=gha
-      #     cache-to: type=gha,mode=max
-      - name: Build Docker image
-        run: |
-          bin/docker-prepare
-          docker-compose build
-          docker-compose push web
+      - name: Docker build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ env.DOCKER_IMAGE_TAG }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Log in to Heroku container
         run: heroku container:login
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 3de74736..df0e399e 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,6 +1,7 @@
 require "active_support/core_ext/integer/time"
 
 Rails.application.configure do
+  config.hosts = ['survey-api-staging.nimblehq.co', 'https://survey-api.nimblehq.co']
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded any time