diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 04fa51a4..5b00a918 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,57 +1,62 @@
-name: Docker Image CI
-
-on:
-  push:
-    branches: [ "main" ]
-    paths:
-      - '**'
-      - 'website/**'
-  workflow_dispatch:
-
-jobs:
-  build-main-app:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && !contains(github.event.head_commit.modified, 'website')) }}
-    steps:
-    - name: Check out the repo
-      uses: actions/checkout@v2
-    - name: Log in to Docker Hub
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKER_HUB_ACCOUNT }}
-        password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-    - name: Build and push main app Docker image
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: deploy/Dockerfile
-        push: true
-        tags: connectai/gitmaya:latest
-
-  build-website:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.head_commit.modified, 'website') }}
-    steps:
-    - name: Check out the repo
-      uses: actions/checkout@v2
-      with:
-        submodules: 'true'
-    - name: Log in to Docker Hub
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKER_HUB_ACCOUNT }}
-        password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-    - name: Build and push website Docker image
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: deploy/Dockerfile.proxy
-        push: true
-        tags: connectai/gitmaya-proxy:latest
-    - name: Build and push website Docker image-SaaS
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: deploy/Dockerfile.proxy.saas
-        push: true
-        tags: connectai/gitmaya-proxy:saas
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "main" ]
+    paths:
+      - '**'
+      - 'website/**'
+  workflow_dispatch:
+
+jobs:
+  build-main-app:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && !contains(github.event.head_commit.modified, 'website')) }}
+    steps:
+    - name: Check out the repo
+      uses: actions/checkout@v2
+
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_HUB_ACCOUNT }}
+        password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+    - name: Build and push main app Docker image
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: deploy/Dockerfile
+        push: true
+        tags: connectai/gitmaya:latest
+
+  build-website:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.head_commit.modified, 'website') }}
+    steps:
+    - name: Check out the repo
+      uses: actions/checkout@v2
+      with:
+        submodules: 'true'
+
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_HUB_ACCOUNT }}
+        password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+    - name: Build and push website Docker image
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: deploy/Dockerfile.proxy
+        push: true
+        tags: connectai/gitmaya-proxy:latest
+
+    - name: Build and push website Docker image-SaaS
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: deploy/Dockerfile.proxy.saas
+        push: true
+        tags: connectai/gitmaya-proxy:saas
diff --git a/deploy/Dockerfile.proxy.saas b/deploy/Dockerfile.proxy.saas
index a149a8a3..ce46c91f 100644
--- a/deploy/Dockerfile.proxy.saas
+++ b/deploy/Dockerfile.proxy.saas
@@ -8,8 +8,7 @@ RUN corepack enable
 COPY ./website /app
 WORKDIR /app
 
-RUN pnpm install --frozen-lockfile
-RUN pnpm build:saas
+RUN pnpm install --frozen-lockfile && pnpm build:saas
 
 FROM jwilder/nginx-proxy:alpine
 
diff --git a/server/utils/redis.py b/server/utils/redis.py
index ceda407d..037ff7ad 100644
--- a/server/utils/redis.py
+++ b/server/utils/redis.py
@@ -10,7 +10,7 @@
 
 app.config.setdefault("REDIS_URL", "redis://redis:6379/0")
 
-client = redis.from_url(app.config["REDIS_URL"], decode_responses=True)
+client = redis.from_url(app.config["CELERY_BROKER_URL"], decode_responses=True)
 
 
 class RedisStorage(object):